summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rw-r--r--www/Makefile15
-rw-r--r--www/buku/Makefile4
-rw-r--r--www/buku/distinfo6
-rw-r--r--www/chromium/Makefile5
-rw-r--r--www/chromium/distinfo10
-rw-r--r--www/chromium/files/patch-build_rust_allocator_BUILD.gn109
-rw-r--r--www/chromium/files/patch-build_rust_allocator_DEPS12
-rw-r--r--www/chromium/files/patch-build_rust_allocator_alias.cc25
-rw-r--r--www/chromium/files/patch-build_rust_allocator_alias.h40
-rw-r--r--www/chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc20
-rw-r--r--www/chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.h24
-rw-r--r--www/chromium/files/patch-build_rust_allocator_allocator__impls.cc108
-rw-r--r--www/chromium/files/patch-build_rust_allocator_allocator__impls.h27
-rw-r--r--www/chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs22
-rw-r--r--www/chromium/files/patch-build_rust_allocator_compiler__specific.h41
-rw-r--r--www/chromium/files/patch-build_rust_allocator_immediate__crash.h174
-rw-r--r--www/chromium/files/patch-build_rust_allocator_lib.rs122
-rw-r--r--www/chromium/files/patch-build_rust_cargo__crate.gni25
-rw-r--r--www/chromium/files/patch-build_rust_rust__macro.gni12
-rw-r--r--www/chromium/files/patch-build_rust_rust__target.gni13
-rw-r--r--www/chromium/files/patch-build_rust_std_BUILD.gn80
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json58
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc13
-rw-r--r--www/cinny/Makefile2
-rw-r--r--www/cinny/distinfo6
-rw-r--r--www/cinny/pkg-plist17
-rw-r--r--www/dokuwiki/Makefile2
-rw-r--r--www/dokuwiki/distinfo6
-rw-r--r--www/dokuwiki/pkg-plist89
-rw-r--r--www/domoticz-devel/Makefile2
-rw-r--r--www/domoticz-devel/files/patch-pr62522178
-rw-r--r--www/domoticz/Makefile3
-rw-r--r--www/domoticz/files/patch-pr62522178
-rw-r--r--www/dooble/Makefile4
-rw-r--r--www/dooble/distinfo6
-rw-r--r--www/element-web/Makefile4
-rw-r--r--www/element-web/distinfo6
-rw-r--r--www/element-web/pkg-plist151
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox-esr/distinfo6
-rw-r--r--www/firefox/Makefile3
-rw-r--r--www/firefox/distinfo6
-rw-r--r--www/firefox/files/patch-bug84756832
-rw-r--r--www/firefox/files/patch-ipc_glue_GeckoChildProcessHost.cpp13
-rw-r--r--www/firefox/files/patch-libwebrtc-generated4924
-rw-r--r--www/firefox/files/patch-third__party_sqlite3_ext_sqlite-vec_sqlite-vec.c15
-rw-r--r--www/firefox/files/patch-toolkit_xre_nsEmbedFunctions.cpp17
-rw-r--r--www/freenginx-devel/Makefile2
-rw-r--r--www/freenginx/Makefile2
-rw-r--r--www/galene/Makefile24
-rw-r--r--www/galene/distinfo48
-rw-r--r--www/gitlab-pages/distinfo10
-rw-r--r--www/gitlab-workhorse/distinfo10
-rw-r--r--www/gitlab/Makefile94
-rw-r--r--www/gitlab/Makefile.common5
-rw-r--r--www/gitlab/distinfo12
-rw-r--r--www/gitlab/files/patch-Gemfile54
-rw-r--r--www/gitlab/files/patch-config_gitlab.yml.example20
-rw-r--r--www/gitlab/files/patch-config_initializers_1__settings.rb4
-rw-r--r--www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec10
-rw-r--r--www/gitlab/pkg-message4
-rw-r--r--www/gohugo/Makefile2
-rw-r--r--www/gohugo/distinfo10
-rw-r--r--www/grafana/Makefile19
-rw-r--r--www/grafana/distinfo102
-rw-r--r--www/homer-web/Makefile2
-rw-r--r--www/homer-web/distinfo6
-rw-r--r--www/homer-web/pkg-plist119
-rw-r--r--www/hs-DAV/Makefile169
-rw-r--r--www/hs-DAV/distinfo446
-rw-r--r--www/hs-gitit/Makefile2
-rw-r--r--www/hs-hjsmin/Makefile16
-rw-r--r--www/hs-hjsmin/distinfo40
-rw-r--r--www/hs-postgrest/Makefile5
-rw-r--r--www/hs-postgrest/Makefile.modules69
-rw-r--r--www/hs-postgrest/distinfo152
-rw-r--r--www/ilias/Makefile2
-rw-r--r--www/ilias/distinfo6
-rw-r--r--www/iridium/Makefile5
-rw-r--r--www/iridium/distinfo6
-rw-r--r--www/iridium/files/patch-build_rust_allocator_BUILD.gn109
-rw-r--r--www/iridium/files/patch-build_rust_allocator_DEPS12
-rw-r--r--www/iridium/files/patch-build_rust_allocator_alias.cc25
-rw-r--r--www/iridium/files/patch-build_rust_allocator_alias.h40
-rw-r--r--www/iridium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc20
-rw-r--r--www/iridium/files/patch-build_rust_allocator_alloc__error__handler__impl.h24
-rw-r--r--www/iridium/files/patch-build_rust_allocator_allocator__impls.cc108
-rw-r--r--www/iridium/files/patch-build_rust_allocator_allocator__impls.h27
-rw-r--r--www/iridium/files/patch-build_rust_allocator_allocator__impls__ffi.rs22
-rw-r--r--www/iridium/files/patch-build_rust_allocator_compiler__specific.h41
-rw-r--r--www/iridium/files/patch-build_rust_allocator_immediate__crash.h174
-rw-r--r--www/iridium/files/patch-build_rust_allocator_lib.rs122
-rw-r--r--www/iridium/files/patch-build_rust_cargo__crate.gni25
-rw-r--r--www/iridium/files/patch-build_rust_rust__macro.gni12
-rw-r--r--www/iridium/files/patch-build_rust_rust__target.gni13
-rw-r--r--www/iridium/files/patch-build_rust_std_BUILD.gn80
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json58
-rw-r--r--www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc13
-rw-r--r--www/libjwt/Makefile2
-rw-r--r--www/librewolf/Makefile5
-rw-r--r--www/librewolf/distinfo6
-rw-r--r--www/linux-vieb/Makefile4
-rw-r--r--www/linux-vieb/distinfo10
-rw-r--r--www/llhttp/Makefile2
-rw-r--r--www/llhttp/distinfo6
-rw-r--r--www/llhttp/files/patch-CMakeLists.txt13
-rw-r--r--www/llhttp/pkg-plist2
-rw-r--r--www/moin2/Makefile2
-rw-r--r--www/nextcloud-appointments/Makefile2
-rw-r--r--www/nextcloud-appointments/distinfo6
-rw-r--r--www/nextcloud-calendar/Makefile2
-rw-r--r--www/nextcloud-calendar/distinfo6
-rw-r--r--www/nextcloud-contacts/Makefile2
-rw-r--r--www/nextcloud-contacts/distinfo6
-rw-r--r--www/nextcloud/Makefile2
-rw-r--r--www/nextcloud/distinfo6
-rw-r--r--www/nginx-devel/Makefile8
-rw-r--r--www/nginx-devel/Makefile.extmod8
-rw-r--r--www/nginx-devel/distinfo10
-rw-r--r--www/nginx/Makefile2
-rw-r--r--www/node18/Makefile2
-rw-r--r--www/node20/Makefile.version2
-rw-r--r--www/node20/distinfo6
-rw-r--r--www/node20/pkg-message2
-rw-r--r--www/node22/Makefile.version2
-rw-r--r--www/node22/distinfo6
-rw-r--r--www/node22/pkg-message2
-rw-r--r--www/node23/Makefile2
-rw-r--r--www/node23/Makefile.version2
-rw-r--r--www/node23/distinfo6
-rw-r--r--www/node23/pkg-message2
-rw-r--r--www/node24/Makefile104
-rw-r--r--www/node24/Makefile.version1
-rw-r--r--www/node24/distinfo3
-rw-r--r--www/node24/files/patch-common.gypi20
-rw-r--r--www/node24/files/patch-deps-openssl-openssl-cl_no_asm.gypi17
-rw-r--r--www/node24/files/patch-deps-openssl-openssl_no_asm.gypi11
-rw-r--r--www/node24/files/patch-deps-v8-src-base-platform-platform-freebsd.cc13
-rw-r--r--www/node24/files/patch-deps-v8-src-codegen-arm-cpu-arm.cc18
-rw-r--r--www/node24/files/patch-deps-v8-src-codegen-ppc-constants-ppc.h20
-rw-r--r--www/node24/files/patch-deps-v8-src-libsampler-sampler.cc13
-rw-r--r--www/node24/files/patch-node.gypi12
-rw-r--r--www/node24/files/patch-src-cares_wrap.h11
-rw-r--r--www/node24/pkg-descr2
-rw-r--r--www/node24/pkg-message7
-rw-r--r--www/node24/pkg-plist2376
-rw-r--r--www/novnc/Makefile2
-rw-r--r--www/novnc/distinfo6
-rw-r--r--www/novnc/pkg-plist7
-rw-r--r--www/npm-node24/Makefile5
-rw-r--r--www/npm/Makefile2
-rw-r--r--www/p5-Mojolicious/Makefile2
-rw-r--r--www/p5-Mojolicious/distinfo6
-rw-r--r--www/p5-Net-Curl/Makefile7
-rw-r--r--www/p5-Net-Curl/files/patch-Makefile.PL11
-rw-r--r--www/p5-Net-Curl/files/patch-inc_symbols-in-versions68
-rw-r--r--www/p5-ParallelUserAgent/Makefile1
-rw-r--r--www/p5-Parse-HTTP-UserAgent/Makefile4
-rw-r--r--www/p5-Parse-HTTP-UserAgent/distinfo6
-rw-r--r--www/p5-Perlanet/Makefile2
-rw-r--r--www/p5-Perlanet/distinfo6
-rw-r--r--www/p5-WWW-OAuth/Makefile10
-rw-r--r--www/p5-WWW-OAuth/distinfo6
-rw-r--r--www/proxygen/Makefile2
-rw-r--r--www/proxygen/distinfo6
-rw-r--r--www/py-adblock/Makefile2
-rw-r--r--www/py-aiohttp/Makefile2
-rw-r--r--www/py-aiohttp/distinfo6
-rw-r--r--www/py-boto3/Makefile6
-rw-r--r--www/py-boto3/distinfo6
-rw-r--r--www/py-dash/Makefile2
-rw-r--r--www/py-dash/distinfo6
-rw-r--r--www/py-dj50-django-auth-ldap/Makefile2
-rw-r--r--www/py-dj50-django-auth-ldap/distinfo6
-rw-r--r--www/py-dj51-django-auth-ldap/Makefile2
-rw-r--r--www/py-dj51-django-auth-ldap/distinfo6
-rw-r--r--www/py-dj51-django-debug-toolbar/Makefile2
-rw-r--r--www/py-dj51-django-debug-toolbar/distinfo6
-rw-r--r--www/py-django-auth-ldap/Makefile4
-rw-r--r--www/py-django-auth-ldap/distinfo6
-rw-r--r--www/py-django-cms/Makefile2
-rw-r--r--www/py-django-cms/distinfo6
-rw-r--r--www/py-django-debug-toolbar/Makefile2
-rw-r--r--www/py-django-debug-toolbar/distinfo6
-rw-r--r--www/py-django-markdownx/Makefile6
-rw-r--r--www/py-django-markdownx/distinfo6
-rw-r--r--www/py-django-stubs-ext/Makefile4
-rw-r--r--www/py-django-stubs-ext/distinfo6
-rw-r--r--www/py-django-tasks/Makefile7
-rw-r--r--www/py-django-tasks/distinfo6
-rw-r--r--www/py-django-unfold/Makefile2
-rw-r--r--www/py-django-unfold/distinfo6
-rw-r--r--www/py-flask/Makefile2
-rw-r--r--www/py-flask/distinfo6
-rw-r--r--www/py-google-cloud-bigquery-storage/Makefile2
-rw-r--r--www/py-google-cloud-bigquery-storage/distinfo6
-rw-r--r--www/py-httpx-retries/Makefile2
-rw-r--r--www/py-httpx-retries/distinfo6
-rw-r--r--www/py-httpx/Makefile3
-rw-r--r--www/py-httpx/files/patch-pyproject.toml11
-rw-r--r--www/py-jh2/Makefile3
-rw-r--r--www/py-jh2/Makefile.crates24
-rw-r--r--www/py-jh2/distinfo54
-rw-r--r--www/py-limits/Makefile4
-rw-r--r--www/py-limits/files/patch-packaging7
-rw-r--r--www/py-notebook/Makefile4
-rw-r--r--www/py-notebook/distinfo6
-rw-r--r--www/py-planet/Makefile2
-rw-r--r--www/py-planet/distinfo6
-rw-r--r--www/py-pyjwt/Makefile3
-rw-r--r--www/py-pyjwt/distinfo6
-rw-r--r--www/py-pyjwt/files/patch-pyproject.toml11
-rw-r--r--www/py-pyjwt/files/patch-setup.cfg9
-rw-r--r--www/py-ticketutil/Makefile2
-rw-r--r--www/py-ticketutil/distinfo6
-rw-r--r--www/py-uvicorn/Makefile2
-rw-r--r--www/py-uvicorn/distinfo6
-rw-r--r--www/py-wagtail-localize/Makefile4
-rw-r--r--www/py-wagtail-localize/distinfo6
-rw-r--r--www/py-wagtail-localize/files/patch-pyproject.toml12
-rw-r--r--www/py-wagtail/Makefile5
-rw-r--r--www/py-wagtail/files/patch-setup.py13
-rw-r--r--www/py-yt-dlp/Makefile2
-rw-r--r--www/py-yt-dlp/distinfo6
-rw-r--r--www/py-yt-dlp/pkg-plist3
-rw-r--r--www/reproxy/Makefile5
-rw-r--r--www/reproxy/distinfo6
-rw-r--r--www/rubygem-actioncable-gitlab/Makefile28
-rw-r--r--www/rubygem-actioncable-gitlab/distinfo3
-rw-r--r--www/rubygem-actioncable-gitlab/pkg-descr7
-rw-r--r--www/rubygem-actionpack-gitlab/Makefile32
-rw-r--r--www/rubygem-actionpack-gitlab/distinfo3
-rw-r--r--www/rubygem-actionpack-gitlab/pkg-descr19
-rw-r--r--www/rubygem-async-http/Makefile2
-rw-r--r--www/rubygem-async-http/distinfo6
-rw-r--r--www/rubygem-coverband/Makefile5
-rw-r--r--www/rubygem-coverband/distinfo6
-rw-r--r--www/rubygem-cssbundling-rails-rails-gitlab/Makefile20
-rw-r--r--www/rubygem-cssbundling-rails-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-cssbundling-rails-rails-gitlab/pkg-descr12
-rw-r--r--www/rubygem-faraday/Makefile2
-rw-r--r--www/rubygem-faraday/distinfo6
-rw-r--r--www/rubygem-gon-rails-gitlab/Makefile24
-rw-r--r--www/rubygem-gon-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-gon-rails-gitlab/pkg-descr2
-rw-r--r--www/rubygem-jquery-ui-rails-rails4/Makefile2
-rw-r--r--www/rubygem-jquery-ui-rails-rails4/distinfo6
-rw-r--r--www/rubygem-kaminari-actionview-rails-gitlab/Makefile21
-rw-r--r--www/rubygem-kaminari-actionview-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-kaminari-actionview-rails-gitlab/pkg-descr1
-rw-r--r--www/rubygem-kaminari-activerecord-rails-gitlab/Makefile21
-rw-r--r--www/rubygem-kaminari-activerecord-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-kaminari-activerecord-rails-gitlab/pkg-descr1
-rw-r--r--www/rubygem-kaminari-rails-gitlab/Makefile25
-rw-r--r--www/rubygem-kaminari-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-kaminari-rails-gitlab/pkg-descr2
-rw-r--r--www/rubygem-lograge-rails-gitlab/Makefile22
-rw-r--r--www/rubygem-lograge-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-lograge-rails-gitlab/pkg-descr6
-rw-r--r--www/rubygem-protocol-http/Makefile2
-rw-r--r--www/rubygem-protocol-http/distinfo6
-rw-r--r--www/rubygem-protocol-rack/Makefile2
-rw-r--r--www/rubygem-protocol-rack/distinfo6
-rw-r--r--www/rubygem-rack-session/Makefile2
-rw-r--r--www/rubygem-rack-session/distinfo6
-rw-r--r--www/rubygem-rack/Makefile2
-rw-r--r--www/rubygem-rack/distinfo6
-rw-r--r--www/rubygem-rack22/Makefile2
-rw-r--r--www/rubygem-rack22/distinfo6
-rw-r--r--www/rubygem-rails-gitlab/Makefile49
-rw-r--r--www/rubygem-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-rails-gitlab/pkg-descr23
-rw-r--r--www/rubygem-railties-gitlab/Makefile36
-rw-r--r--www/rubygem-railties-gitlab/distinfo3
-rw-r--r--www/rubygem-railties-gitlab/pkg-descr4
-rw-r--r--www/rubygem-redis-rack-gitlab/Makefile25
-rw-r--r--www/rubygem-redis-rack-gitlab/distinfo3
-rw-r--r--www/rubygem-redis-rack-gitlab/pkg-descr1
-rw-r--r--www/rubygem-responders-rails-gitlab/Makefile21
-rw-r--r--www/rubygem-responders-rails-gitlab/distinfo3
-rw-r--r--www/rubygem-responders-rails-gitlab/pkg-descr1
-rw-r--r--www/rubygem-rqrcode/Makefile2
-rw-r--r--www/rubygem-rqrcode/distinfo6
-rw-r--r--www/rubygem-selenium-webdriver/Makefile2
-rw-r--r--www/rubygem-selenium-webdriver/distinfo6
-rw-r--r--www/rubygem-thruster/Makefile2
-rw-r--r--www/rubygem-thruster/distinfo6
-rw-r--r--www/selenium/Makefile8
-rw-r--r--www/selenium/distinfo6
-rw-r--r--www/smarty/Makefile2
-rw-r--r--www/smarty/distinfo6
-rw-r--r--www/sogo/Makefile2
-rw-r--r--www/sogo/distinfo6
-rw-r--r--www/sogo/files/patch-SoObjects_SOGo_SOGoMailer.m11
-rw-r--r--www/sogo/pkg-plist9
-rw-r--r--www/tgpt/Makefile2
-rw-r--r--www/tgpt/distinfo10
-rw-r--r--www/tomcat-devel/Makefile3
-rw-r--r--www/tomcat-devel/distinfo6
-rw-r--r--www/tomcat-devel/pkg-plist10
-rw-r--r--www/tomcat101/Makefile3
-rw-r--r--www/tomcat101/distinfo6
-rw-r--r--www/tomcat101/pkg-plist10
-rw-r--r--www/tomcat110/Makefile3
-rw-r--r--www/tomcat110/distinfo6
-rw-r--r--www/tomcat110/pkg-plist10
-rw-r--r--www/tomcat9/Makefile3
-rw-r--r--www/tomcat9/distinfo6
-rw-r--r--www/tomcat9/pkg-plist10
-rw-r--r--www/tor-browser/Makefile8
-rw-r--r--www/tor-browser/distinfo14
-rw-r--r--www/trunk/Makefile53
-rw-r--r--www/trunk/distinfo106
-rw-r--r--www/tt-rss/Makefile8
-rw-r--r--www/tt-rss/distinfo6
-rw-r--r--www/tt-rss/pkg-plist13
-rw-r--r--www/typo3-12/Makefile2
-rw-r--r--www/typo3-12/distinfo6
-rw-r--r--www/typo3-13/Makefile4
-rw-r--r--www/typo3-13/distinfo6
-rw-r--r--www/ungoogled-chromium/Makefile5
-rw-r--r--www/ungoogled-chromium/distinfo14
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_BUILD.gn109
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_DEPS12
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_alias.cc25
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_alias.h40
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc20
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.h24
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls.cc108
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls.h27
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs22
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_compiler__specific.h41
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_immediate__crash.h174
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs122
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_cargo__crate.gni25
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_rust__macro.gni12
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_rust__target.gni13
-rw-r--r--www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn80
-rw-r--r--www/ungoogled-chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json58
-rw-r--r--www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc13
-rw-r--r--www/unit/Makefile1
-rw-r--r--www/unit/files/patch-auto_njs22
-rw-r--r--www/unit/files/patch-src_nxt__http__js.c139
-rw-r--r--www/xapian-omega/Makefile2
-rw-r--r--www/xapian-omega/distinfo6
-rw-r--r--www/yarn-node24/Makefile5
-rw-r--r--www/yourls/Makefile2
-rw-r--r--www/yourls/distinfo6
-rw-r--r--www/youtube/Makefile3
-rw-r--r--www/youtube/distinfo10
-rw-r--r--www/yt-dlp/Makefile2
-rw-r--r--www/yt-dlp/distinfo6
-rw-r--r--www/zenphoto/Makefile2
-rw-r--r--www/zenphoto/distinfo6
-rw-r--r--www/zenphoto/pkg-plist258
355 files changed, 14288 insertions, 4228 deletions
diff --git a/www/Makefile b/www/Makefile
index ba55f2b6fd84..16d9e68fa6ef 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -489,6 +489,7 @@
SUBDIR += node20
SUBDIR += node22
SUBDIR += node23
+ SUBDIR += node24
SUBDIR += nostromo
SUBDIR += novnc
SUBDIR += novnc-websockify
@@ -498,6 +499,7 @@
SUBDIR += npm-node20
SUBDIR += npm-node22
SUBDIR += npm-node23
+ SUBDIR += npm-node24
SUBDIR += nyxt
SUBDIR += oauth2-proxy
SUBDIR += obhttpd
@@ -2008,6 +2010,7 @@
SUBDIR += rt44
SUBDIR += rt50
SUBDIR += rubygem-ace-rails-ap
+ SUBDIR += rubygem-actioncable-gitlab
SUBDIR += rubygem-actioncable5
SUBDIR += rubygem-actioncable50
SUBDIR += rubygem-actioncable52
@@ -2017,6 +2020,7 @@
SUBDIR += rubygem-actioncable71
SUBDIR += rubygem-actioncable72
SUBDIR += rubygem-actioncable80
+ SUBDIR += rubygem-actionpack-gitlab
SUBDIR += rubygem-actionpack4
SUBDIR += rubygem-actionpack5
SUBDIR += rubygem-actionpack50
@@ -2072,6 +2076,7 @@
SUBDIR += rubygem-crass
SUBDIR += rubygem-cssbundling-rails
SUBDIR += rubygem-cssbundling-rails-gitlab
+ SUBDIR += rubygem-cssbundling-rails-rails-gitlab
SUBDIR += rubygem-cssbundling-rails-rails70
SUBDIR += rubygem-cssbundling-rails-rails71
SUBDIR += rubygem-cssbundling-rails-rails72
@@ -2137,6 +2142,7 @@
SUBDIR += rubygem-gollum-grit_adapter
SUBDIR += rubygem-gollum-lib
SUBDIR += rubygem-gollum-rugged_adapter
+ SUBDIR += rubygem-gon-rails-gitlab
SUBDIR += rubygem-gon-rails5
SUBDIR += rubygem-gon-rails50
SUBDIR += rubygem-gon-rails60
@@ -2203,6 +2209,7 @@
SUBDIR += rubygem-kamal
SUBDIR += rubygem-kaminari
SUBDIR += rubygem-kaminari-actionview
+ SUBDIR += rubygem-kaminari-actionview-rails-gitlab
SUBDIR += rubygem-kaminari-actionview-rails5
SUBDIR += rubygem-kaminari-actionview-rails50
SUBDIR += rubygem-kaminari-actionview-rails52
@@ -2210,6 +2217,7 @@
SUBDIR += rubygem-kaminari-actionview-rails61
SUBDIR += rubygem-kaminari-actionview-rails70
SUBDIR += rubygem-kaminari-activerecord
+ SUBDIR += rubygem-kaminari-activerecord-rails-gitlab
SUBDIR += rubygem-kaminari-activerecord-rails5
SUBDIR += rubygem-kaminari-activerecord-rails50
SUBDIR += rubygem-kaminari-activerecord-rails52
@@ -2217,6 +2225,7 @@
SUBDIR += rubygem-kaminari-activerecord-rails61
SUBDIR += rubygem-kaminari-activerecord-rails70
SUBDIR += rubygem-kaminari-core
+ SUBDIR += rubygem-kaminari-rails-gitlab
SUBDIR += rubygem-kaminari-rails4
SUBDIR += rubygem-kaminari-rails5
SUBDIR += rubygem-kaminari-rails50
@@ -2232,6 +2241,7 @@
SUBDIR += rubygem-llhttp
SUBDIR += rubygem-llhttp-ffi
SUBDIR += rubygem-lograge
+ SUBDIR += rubygem-lograge-rails-gitlab
SUBDIR += rubygem-lograge-rails5
SUBDIR += rubygem-lograge-rails52
SUBDIR += rubygem-lograge-rails60
@@ -2306,6 +2316,7 @@
SUBDIR += rubygem-rackup
SUBDIR += rubygem-rackup10
SUBDIR += rubygem-rackup21
+ SUBDIR += rubygem-rails-gitlab
SUBDIR += rubygem-rails-settings-cached
SUBDIR += rubygem-rails-settings-cached-rails5
SUBDIR += rubygem-rails-settings-cached-rails50
@@ -2323,6 +2334,7 @@
SUBDIR += rubygem-rails_autolink
SUBDIR += rubygem-rails_serve_static_assets
SUBDIR += rubygem-rails_stdout_logging
+ SUBDIR += rubygem-railties-gitlab
SUBDIR += rubygem-railties4
SUBDIR += rubygem-railties5
SUBDIR += rubygem-railties50
@@ -2342,6 +2354,7 @@
SUBDIR += rubygem-rdf-normalize
SUBDIR += rubygem-redcloth
SUBDIR += rubygem-redis-rack
+ SUBDIR += rubygem-redis-rack-gitlab
SUBDIR += rubygem-redis-rack2
SUBDIR += rubygem-redis-rails
SUBDIR += rubygem-redis-rails-rails5
@@ -2350,6 +2363,7 @@
SUBDIR += rubygem-redis-rails-rails60
SUBDIR += rubygem-redis-rails-rails61
SUBDIR += rubygem-responders
+ SUBDIR += rubygem-responders-rails-gitlab
SUBDIR += rubygem-responders-rails5
SUBDIR += rubygem-responders-rails52
SUBDIR += rubygem-responders-rails60
@@ -2655,6 +2669,7 @@
SUBDIR += yarn-node20
SUBDIR += yarn-node22
SUBDIR += yarn-node23
+ SUBDIR += yarn-node24
SUBDIR += yarr
SUBDIR += yaws
SUBDIR += you-get
diff --git a/www/buku/Makefile b/www/buku/Makefile
index bd8b5c36bdfa..40682e095937 100644
--- a/www/buku/Makefile
+++ b/www/buku/Makefile
@@ -1,5 +1,5 @@
PORTNAME= buku
-PORTVERSION= 4.9
+PORTVERSION= 5.0
DISTVERSIONPREFIX= v
CATEGORIES= www python
@@ -16,7 +16,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup>=4.4.1:www/py-beautifulsoup@${
${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}html5lib>=1.0.1:www/py-html5lib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}urllib3>=1.23,1<2,1:net/py-urllib3@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}urllib3>=1.23,1<3,1:net/py-urllib3@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist cryptography noflavors pep517
diff --git a/www/buku/distinfo b/www/buku/distinfo
index 38fe044393aa..2720a69a8e53 100644
--- a/www/buku/distinfo
+++ b/www/buku/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712580506
-SHA256 (jarun-buku-v4.9_GH0.tar.gz) = 1e432270ae78c7852110dcf2c2e215893bcc338299a4998f14a1f6b26e37bfac
-SIZE (jarun-buku-v4.9_GH0.tar.gz) = 615794
+TIMESTAMP = 1745936044
+SHA256 (jarun-buku-v5.0_GH0.tar.gz) = 87e226b0062a17cb10bf02a6cefea08e859d74985e373b76496150ecda92d73e
+SIZE (jarun-buku-v5.0_GH0.tar.gz) = 662828
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 7ce5d02167fe..023f8f9f95f5 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,6 @@
PORTNAME= chromium
-PORTVERSION= 136.0.7103.92
+PORTVERSION= 136.0.7103.113
+PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
@@ -16,7 +17,7 @@ WWW= https://www.chromium.org/Home
LICENSE= BSD3CLAUSE LGPL21 MPL11
LICENSE_COMB= multi
-ONLY_FOR_ARCHS= aarch64 amd64 i386
+ONLY_FOR_ARCHS= aarch64 amd64
BUILD_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 8897a937751d..89fdf6cdec3c 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1746600351
-SHA256 (chromium-136.0.7103.92.tar.xz) = 3fa7f88ef186566948367bf1e9a9f0612e753fc69285c1654728f6a015cd4cf2
-SIZE (chromium-136.0.7103.92.tar.xz) = 7188412240
+TIMESTAMP = 1747298146
+SHA256 (chromium-136.0.7103.113.tar.xz) = 7c765bd13df842a28bb52279b8d711411ac6082151473e07bd70b9a482c0a0ac
+SIZE (chromium-136.0.7103.113.tar.xz) = 7196537592
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
-SHA256 (chromium-136.0.7103.92-testdata.tar.xz) = 6e5bb3fba5b61ffc9e91b9d2fc9cc758bebe4d16806a68b1a32b189193c78256
-SIZE (chromium-136.0.7103.92-testdata.tar.xz) = 651393856
+SHA256 (chromium-136.0.7103.113-testdata.tar.xz) = cbf264643986db5b7aa91843ea64a1b9e23d00bb226b234d4f60788469a58ef8
+SIZE (chromium-136.0.7103.113-testdata.tar.xz) = 651614116
diff --git a/www/chromium/files/patch-build_rust_allocator_BUILD.gn b/www/chromium/files/patch-build_rust_allocator_BUILD.gn
new file mode 100644
index 000000000000..cb1633140dcc
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_BUILD.gn
@@ -0,0 +1,109 @@
+--- build/rust/allocator/BUILD.gn.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/BUILD.gn
+@@ -0,0 +1,106 @@
++# Copyright 2025 The Chromium Authors
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/buildflag_header.gni")
++import("//build/config/rust.gni")
++import("//build/rust/rust_static_library.gni")
++
++rust_allocator_uses_partition_alloc = false
++if (build_with_chromium) {
++ import("//base/allocator/partition_allocator/partition_alloc.gni")
++ rust_allocator_uses_partition_alloc = use_partition_alloc_as_malloc
++}
++
++# In ASAN builds, PartitionAlloc-Everywhere is disabled, meaning malloc() and
++# friends in C++ do not go to PartitionAlloc. So we also don't point the Rust
++# allocation functions at PartitionAlloc. Generally, this means we just direct
++# them to the Standard Library's allocator.
++#
++# However, on Windows the Standard Library uses HeapAlloc() and Windows ASAN
++# does *not* hook that method, so ASAN does not get to hear about allocations
++# made in Rust. To resolve this, we redirect allocation to _aligned_malloc
++# which Windows ASAN *does* hook.
++#
++# Note that there is a runtime option to make ASAN hook HeapAlloc() but
++# enabling it breaks Win32 APIs like CreateProcess:
++# https://crbug.com/368070343#comment29
++rust_allocator_uses_aligned_malloc = false
++if (!rust_allocator_uses_partition_alloc && is_win && is_asan) {
++ rust_allocator_uses_aligned_malloc = true
++}
++
++rust_allocator_uses_allocator_impls_h =
++ rust_allocator_uses_partition_alloc || rust_allocator_uses_aligned_malloc
++
++buildflag_header("buildflags") {
++ header = "buildflags.h"
++ flags = [
++ "RUST_ALLOCATOR_USES_PARTITION_ALLOC=$rust_allocator_uses_partition_alloc",
++ "RUST_ALLOCATOR_USES_ALIGNED_MALLOC=$rust_allocator_uses_aligned_malloc",
++ ]
++ visibility = [ ":*" ]
++}
++
++if (toolchain_has_rust) {
++ # All targets which depend on Rust code but are not linked by rustc must
++ # depend on this. Usually, this dependency will come from the rust_target() GN
++ # template. However, cargo_crate() does *not* include this dependency so any
++ # C++ targets which directly depend on a cargo_crate() must depend on this.
++ rust_static_library("allocator") {
++ sources = [ "lib.rs" ]
++ crate_root = "lib.rs"
++ cxx_bindings = [ "lib.rs" ]
++
++ deps = [ ":alloc_error_handler_impl" ]
++ if (rust_allocator_uses_allocator_impls_h) {
++ deps += [ ":allocator_impls" ]
++ }
++
++ no_chromium_prelude = true
++ no_allocator_crate = true
++ allow_unsafe = true
++
++ rustflags = []
++ if (rust_allocator_uses_allocator_impls_h) {
++ rustflags += [ "--cfg=rust_allocator_uses_allocator_impls_h" ]
++ cxx_bindings += [ "allocator_impls_ffi.rs" ]
++ sources += [ "allocator_impls_ffi.rs" ]
++ }
++
++ # TODO(https://crbug.com/410596442): Stop using unstable features here.
++ configs -= [ "//build/config/compiler:disallow_unstable_features" ]
++ }
++
++ if (rust_allocator_uses_allocator_impls_h) {
++ static_library("allocator_impls") {
++ public_deps = []
++ if (rust_allocator_uses_partition_alloc) {
++ public_deps +=
++ [ "//base/allocator/partition_allocator:partition_alloc" ]
++ }
++
++ sources = [
++ "allocator_impls.cc",
++ "allocator_impls.h",
++ ]
++ deps = [ ":buildflags" ]
++ visibility = [ ":*" ]
++ }
++ }
++
++ static_library("alloc_error_handler_impl") {
++ sources = [
++ # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
++ # copied from `//base`.
++ # TODO(crbug.com/40279749): Avoid duplication / reuse code.
++ "alias.cc",
++ "alias.h",
++ "alloc_error_handler_impl.cc",
++ "alloc_error_handler_impl.h",
++ "compiler_specific.h",
++ "immediate_crash.h",
++ ]
++ visibility = [ ":*" ]
++ }
++}
diff --git a/www/chromium/files/patch-build_rust_allocator_DEPS b/www/chromium/files/patch-build_rust_allocator_DEPS
new file mode 100644
index 000000000000..74bb2d6c2421
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_DEPS
@@ -0,0 +1,12 @@
+--- build/rust/allocator/DEPS.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/DEPS
+@@ -0,0 +1,9 @@
++include_rules = [
++ "-base",
++]
++
++specific_include_rules = {
++ "allocator_impls.cc" : [
++ "+partition_alloc"
++ ]
++}
diff --git a/www/chromium/files/patch-build_rust_allocator_alias.cc b/www/chromium/files/patch-build_rust_allocator_alias.cc
new file mode 100644
index 000000000000..5280641f27e1
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_alias.cc
@@ -0,0 +1,25 @@
+--- build/rust/allocator/alias.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alias.cc
+@@ -0,0 +1,22 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/debug/alias.cc ( additionally the APIs
++// were moved into the `build_rust_std` namespace).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#include "build/rust/allocator/alias.h"
++
++#include "build/rust/allocator/compiler_specific.h"
++
++namespace build_rust_std {
++namespace debug {
++
++// This file/function should be excluded from LTO/LTCG to ensure that the
++// compiler can't see this function's implementation when compiling calls to it.
++NOINLINE void Alias(const void* var) {}
++
++} // namespace debug
++} // namespace build_rust_std
diff --git a/www/chromium/files/patch-build_rust_allocator_alias.h b/www/chromium/files/patch-build_rust_allocator_alias.h
new file mode 100644
index 000000000000..6530c6ae8779
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_alias.h
@@ -0,0 +1,40 @@
+--- build/rust/allocator/alias.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alias.h
+@@ -0,0 +1,37 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/debug/alias.h (and then trimmed to just
++// the APIs / macros needed by //build/rust/std; additionally the APIs were
++// moved into the `build_rust_std` namespace).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALIAS_H_
++#define BUILD_RUST_ALLOCATOR_ALIAS_H_
++
++#include <stddef.h>
++
++namespace build_rust_std {
++namespace debug {
++
++// Make the optimizer think that |var| is aliased. This can be used to prevent a
++// local variable from being optimized out (which is something that
++// `NO_CODE_FOLDING` macro definition below depends on). See
++// //base/debug/alias.h for more details.
++void Alias(const void* var);
++
++} // namespace debug
++
++} // namespace build_rust_std
++
++// Prevent code folding (where a linker identifies functions that are
++// bit-identical and overlays them, which saves space but it leads to confusing
++// call stacks because multiple symbols are at the same address). See
++// //base/debug/alias.h for more details.
++#define NO_CODE_FOLDING() \
++ const int line_number = __LINE__; \
++ build_rust_std::debug::Alias(&line_number)
++
++#endif // BUILD_RUST_ALLOCATOR_ALIAS_H_
diff --git a/www/chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc b/www/chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc
new file mode 100644
index 000000000000..048c267abefa
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc
@@ -0,0 +1,20 @@
+--- build/rust/allocator/alloc_error_handler_impl.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alloc_error_handler_impl.cc
+@@ -0,0 +1,17 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "build/rust/allocator/alloc_error_handler_impl.h"
++
++#include "build/rust/allocator/alias.h"
++#include "build/rust/allocator/immediate_crash.h"
++
++namespace rust_allocator_internal {
++
++void alloc_error_handler_impl() {
++ NO_CODE_FOLDING();
++ IMMEDIATE_CRASH();
++}
++
++} // namespace rust_allocator_internal
diff --git a/www/chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.h b/www/chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.h
new file mode 100644
index 000000000000..887ea602b027
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.h
@@ -0,0 +1,24 @@
+--- build/rust/allocator/alloc_error_handler_impl.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alloc_error_handler_impl.h
+@@ -0,0 +1,21 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
++#define BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
++
++// This header exposes to Rust a C++ implementation of quickly crashing after an
++// allocation error. (The API below is called from `__rust_alloc_error_handler`
++// in `lib.rs`.)
++//
++// TODO(lukasza): Investigate if we can delete this `.h` / `.cc` and just call
++// `std::process::abort()` (or something else?) directly from `.rs`. The main
++// open question is how much we care about `NO_CODE_FOLDING`.
++namespace rust_allocator_internal {
++
++void alloc_error_handler_impl();
++
++} // namespace rust_allocator_internal
++
++#endif // BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
diff --git a/www/chromium/files/patch-build_rust_allocator_allocator__impls.cc b/www/chromium/files/patch-build_rust_allocator_allocator__impls.cc
new file mode 100644
index 000000000000..94e04d7b966a
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_allocator__impls.cc
@@ -0,0 +1,108 @@
+--- build/rust/allocator/allocator_impls.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls.cc
+@@ -0,0 +1,105 @@
++// Copyright 2021 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "build/rust/allocator/allocator_impls.h"
++
++#ifdef UNSAFE_BUFFERS_BUILD
++// TODO(crbug.com/390223051): Remove C-library calls to fix the errors.
++#pragma allow_unsafe_libc_calls
++#endif
++
++#include <cstddef>
++#include <cstring>
++
++#include "build/build_config.h"
++#include "build/rust/allocator/buildflags.h"
++
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++#include "partition_alloc/partition_alloc_constants.h" // nogncheck
++#include "partition_alloc/shim/allocator_shim.h" // nogncheck
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++#include <cstdlib>
++#endif
++
++namespace rust_allocator_internal {
++
++unsigned char* alloc(size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ // PartitionAlloc will crash if given an alignment larger than this.
++ if (align > partition_alloc::internal::kMaxSupportedAlignment) {
++ return nullptr;
++ }
++
++ // We use unchecked allocation paths in PartitionAlloc rather than going
++ // through its shims in `malloc()` etc so that we can support fallible
++ // allocation paths such as Vec::try_reserve without crashing on allocation
++ // failure.
++ if (align <= alignof(std::max_align_t)) {
++ return static_cast<unsigned char*>(allocator_shim::UncheckedAlloc(size));
++ } else {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedAlignedAlloc(size, align));
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return static_cast<unsigned char*>(_aligned_malloc(size, align));
++#else
++#error This configuration is not supported.
++#endif
++}
++
++void dealloc(unsigned char* p, size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ if (align <= alignof(std::max_align_t)) {
++ allocator_shim::UncheckedFree(p);
++ } else {
++ allocator_shim::UncheckedAlignedFree(p);
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return _aligned_free(p);
++#else
++#error This configuration is not supported.
++#endif
++}
++
++unsigned char* realloc(unsigned char* p,
++ size_t old_size,
++ size_t align,
++ size_t new_size) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ // We use unchecked allocation paths in PartitionAlloc rather than going
++ // through its shims in `malloc()` etc so that we can support fallible
++ // allocation paths such as Vec::try_reserve without crashing on allocation
++ // failure.
++ if (align <= alignof(std::max_align_t)) {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedRealloc(p, new_size));
++ } else {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedAlignedRealloc(p, new_size, align));
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return static_cast<unsigned char*>(_aligned_realloc(p, new_size, align));
++#else
++#error This configuration is not supported.
++#endif
++}
++
++unsigned char* alloc_zeroed(size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC) || \
++ BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ // TODO(danakj): When RUST_ALLOCATOR_USES_PARTITION_ALLOC is true, it's
++ // possible that a partition_alloc::UncheckedAllocZeroed() call would perform
++ // better than partition_alloc::UncheckedAlloc() + memset. But there is no
++ // such API today. See b/342251590.
++ unsigned char* p = alloc(size, align);
++ if (p) {
++ memset(p, 0, size);
++ }
++ return p;
++#else
++#error This configuration is not supported.
++#endif
++}
++
++} // namespace rust_allocator_internal
diff --git a/www/chromium/files/patch-build_rust_allocator_allocator__impls.h b/www/chromium/files/patch-build_rust_allocator_allocator__impls.h
new file mode 100644
index 000000000000..9249cdc938d2
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_allocator__impls.h
@@ -0,0 +1,27 @@
+--- build/rust/allocator/allocator_impls.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls.h
+@@ -0,0 +1,24 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
++#define BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
++
++#include <cstddef>
++
++// This header exposes a C++ allocator (e.g. PartitionAlloc) to Rust.
++// The APIs below are called from `impl GlobalAlloc` in `lib.rs`.
++namespace rust_allocator_internal {
++
++unsigned char* alloc(size_t size, size_t align);
++void dealloc(unsigned char* p, size_t size, size_t align);
++unsigned char* realloc(unsigned char* p,
++ size_t old_size,
++ size_t align,
++ size_t new_size);
++unsigned char* alloc_zeroed(size_t size, size_t align);
++
++} // namespace rust_allocator_internal
++
++#endif // BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
diff --git a/www/chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs b/www/chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs
new file mode 100644
index 000000000000..8f0baf1576ce
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs
@@ -0,0 +1,22 @@
+--- build/rust/allocator/allocator_impls_ffi.rs.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls_ffi.rs
+@@ -0,0 +1,19 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++//! FFI for `allocator_impls.h` is in a separate `.rs` file/module to
++//! better support conditional compilation (these functions are only
++//! used under `#[cfg(rust_allocator_uses_allocator_impls_h)]`.
++
++#[cxx::bridge(namespace = "rust_allocator_internal")]
++pub mod ffi {
++ extern "C++" {
++ include!("build/rust/allocator/allocator_impls.h");
++
++ unsafe fn alloc(size: usize, align: usize) -> *mut u8;
++ unsafe fn dealloc(p: *mut u8, size: usize, align: usize);
++ unsafe fn realloc(p: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8;
++ unsafe fn alloc_zeroed(size: usize, align: usize) -> *mut u8;
++ }
++}
diff --git a/www/chromium/files/patch-build_rust_allocator_compiler__specific.h b/www/chromium/files/patch-build_rust_allocator_compiler__specific.h
new file mode 100644
index 000000000000..7feb0c739d79
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_compiler__specific.h
@@ -0,0 +1,41 @@
+--- build/rust/allocator/compiler_specific.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/compiler_specific.h
+@@ -0,0 +1,38 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/compiler_specific.h (and then
++// significantly trimmed to just the APIs / macros needed by //build/rust/std).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
++#define BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
++
++#include "build/build_config.h"
++
++#if defined(COMPILER_MSVC) && !defined(__clang__)
++#error "Only clang-cl is supported on Windows, see https://crbug.com/988071"
++#endif
++
++#if defined(__has_attribute)
++#define HAS_ATTRIBUTE(x) __has_attribute(x)
++#else
++#define HAS_ATTRIBUTE(x) 0
++#endif
++
++// Annotate a function indicating it should not be inlined.
++// Use like:
++// NOINLINE void DoStuff() { ... }
++#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
++#define NOINLINE [[clang::noinline]]
++#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
++#define NOINLINE __attribute__((noinline))
++#elif defined(COMPILER_MSVC)
++#define NOINLINE __declspec(noinline)
++#else
++#define NOINLINE
++#endif
++
++#endif // BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
diff --git a/www/chromium/files/patch-build_rust_allocator_immediate__crash.h b/www/chromium/files/patch-build_rust_allocator_immediate__crash.h
new file mode 100644
index 000000000000..7ab0f9d9c34c
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_immediate__crash.h
@@ -0,0 +1,174 @@
+--- build/rust/allocator/immediate_crash.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/immediate_crash.h
+@@ -0,0 +1,171 @@
++// Copyright 2021 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/immediate_crash.h.
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
++#define BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
++
++#include "build/build_config.h"
++
++// Crashes in the fastest possible way with no attempt at logging.
++// There are several constraints; see http://crbug.com/664209 for more context.
++//
++// - TRAP_SEQUENCE_() must be fatal. It should not be possible to ignore the
++// resulting exception or simply hit 'continue' to skip over it in a debugger.
++// - Different instances of TRAP_SEQUENCE_() must not be folded together, to
++// ensure crash reports are debuggable. Unlike __builtin_trap(), asm volatile
++// blocks will not be folded together.
++// Note: TRAP_SEQUENCE_() previously required an instruction with a unique
++// nonce since unlike clang, GCC folds together identical asm volatile
++// blocks.
++// - TRAP_SEQUENCE_() must produce a signal that is distinct from an invalid
++// memory access.
++// - TRAP_SEQUENCE_() must be treated as a set of noreturn instructions.
++// __builtin_unreachable() is used to provide that hint here. clang also uses
++// this as a heuristic to pack the instructions in the function epilogue to
++// improve code density.
++//
++// Additional properties that are nice to have:
++// - TRAP_SEQUENCE_() should be as compact as possible.
++// - The first instruction of TRAP_SEQUENCE_() should not change, to avoid
++// shifting crash reporting clusters. As a consequence of this, explicit
++// assembly is preferred over intrinsics.
++// Note: this last bullet point may no longer be true, and may be removed in
++// the future.
++
++// Note: TRAP_SEQUENCE Is currently split into two macro helpers due to the fact
++// that clang emits an actual instruction for __builtin_unreachable() on certain
++// platforms (see https://crbug.com/958675). In addition, the int3/bkpt/brk will
++// be removed in followups, so splitting it up like this now makes it easy to
++// land the followups.
++
++#if defined(COMPILER_GCC)
++
++#if BUILDFLAG(IS_NACL)
++
++// Crash report accuracy is not guaranteed on NaCl.
++#define TRAP_SEQUENCE1_() __builtin_trap()
++#define TRAP_SEQUENCE2_() asm volatile("")
++
++#elif defined(ARCH_CPU_X86_FAMILY)
++
++// TODO(crbug.com/40625592): In theory, it should be possible to use just
++// int3. However, there are a number of crashes with SIGILL as the exception
++// code, so it seems likely that there's a signal handler that allows execution
++// to continue after SIGTRAP.
++#define TRAP_SEQUENCE1_() asm volatile("int3")
++
++#if BUILDFLAG(IS_APPLE)
++// Intentionally empty: __builtin_unreachable() is always part of the sequence
++// (see IMMEDIATE_CRASH below) and already emits a ud2 on Mac.
++#define TRAP_SEQUENCE2_() asm volatile("")
++#else
++#define TRAP_SEQUENCE2_() asm volatile("ud2")
++#endif // BUILDFLAG(IS_APPLE)
++
++#elif defined(ARCH_CPU_ARMEL)
++
++// bkpt will generate a SIGBUS when running on armv7 and a SIGTRAP when running
++// as a 32 bit userspace app on arm64. There doesn't seem to be any way to
++// cause a SIGTRAP from userspace without using a syscall (which would be a
++// problem for sandboxing).
++// TODO(crbug.com/40625592): Remove bkpt from this sequence.
++#define TRAP_SEQUENCE1_() asm volatile("bkpt #0")
++#define TRAP_SEQUENCE2_() asm volatile("udf #0")
++
++#elif defined(ARCH_CPU_ARM64)
++
++// This will always generate a SIGTRAP on arm64.
++// TODO(crbug.com/40625592): Remove brk from this sequence.
++#define TRAP_SEQUENCE1_() asm volatile("brk #0")
++#define TRAP_SEQUENCE2_() asm volatile("hlt #0")
++
++#else
++
++// Crash report accuracy will not be guaranteed on other architectures, but at
++// least this will crash as expected.
++#define TRAP_SEQUENCE1_() __builtin_trap()
++#define TRAP_SEQUENCE2_() asm volatile("")
++
++#endif // ARCH_CPU_*
++
++#elif defined(COMPILER_MSVC)
++
++#if !defined(__clang__)
++
++// MSVC x64 doesn't support inline asm, so use the MSVC intrinsic.
++#define TRAP_SEQUENCE1_() __debugbreak()
++#define TRAP_SEQUENCE2_()
++
++#elif defined(ARCH_CPU_ARM64)
++
++// Windows ARM64 uses "BRK #F000" as its breakpoint instruction, and
++// __debugbreak() generates that in both VC++ and clang.
++#define TRAP_SEQUENCE1_() __debugbreak()
++// Intentionally empty: __builtin_unreachable() is always part of the sequence
++// (see IMMEDIATE_CRASH below) and already emits a ud2 on Win64,
++// https://crbug.com/958373
++#define TRAP_SEQUENCE2_() __asm volatile("")
++
++#else
++
++#define TRAP_SEQUENCE1_() asm volatile("int3")
++#define TRAP_SEQUENCE2_() asm volatile("ud2")
++
++#endif // __clang__
++
++#else
++
++#error No supported trap sequence!
++
++#endif // COMPILER_GCC
++
++#define TRAP_SEQUENCE_() \
++ do { \
++ TRAP_SEQUENCE1_(); \
++ TRAP_SEQUENCE2_(); \
++ } while (false)
++
++// CHECK() and the trap sequence can be invoked from a constexpr function.
++// This could make compilation fail on GCC, as it forbids directly using inline
++// asm inside a constexpr function. However, it allows calling a lambda
++// expression including the same asm.
++// The side effect is that the top of the stacktrace will not point to the
++// calling function, but to this anonymous lambda. This is still useful as the
++// full name of the lambda will typically include the name of the function that
++// calls CHECK() and the debugger will still break at the right line of code.
++#if !defined(COMPILER_GCC) || defined(__clang__)
++
++#define WRAPPED_TRAP_SEQUENCE_() TRAP_SEQUENCE_()
++
++#else
++
++#define WRAPPED_TRAP_SEQUENCE_() \
++ do { \
++ [] { TRAP_SEQUENCE_(); }(); \
++ } while (false)
++
++#endif // !defined(COMPILER_GCC) || defined(__clang__)
++
++#if defined(__clang__) || defined(COMPILER_GCC)
++
++// __builtin_unreachable() hints to the compiler that this is noreturn and can
++// be packed in the function epilogue.
++#define IMMEDIATE_CRASH() \
++ ({ \
++ WRAPPED_TRAP_SEQUENCE_(); \
++ __builtin_unreachable(); \
++ })
++
++#else
++
++// This is supporting non-chromium user of logging.h to build with MSVC, like
++// pdfium. On MSVC there is no __builtin_unreachable().
++#define IMMEDIATE_CRASH() WRAPPED_TRAP_SEQUENCE_()
++
++#endif // defined(__clang__) || defined(COMPILER_GCC)
++
++#endif // BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
diff --git a/www/chromium/files/patch-build_rust_allocator_lib.rs b/www/chromium/files/patch-build_rust_allocator_lib.rs
new file mode 100644
index 000000000000..89fddf278294
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_allocator_lib.rs
@@ -0,0 +1,122 @@
+--- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/lib.rs
+@@ -0,0 +1,119 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++//! Define the allocator that Rust code in Chrome should use.
++//!
++//! Any final artifact that depends on this crate, even transitively, will use
++//! the allocator defined here.
++//!
++//! List of known issues:
++//!
++//! 1. We'd like to use PartitionAlloc on Windows, but the stdlib uses Windows
++//! heap functions directly that PartitionAlloc can not intercept.
++//! 2. We'd like `Vec::try_reserve` to fail at runtime on Linux instead of
++//! crashing in malloc() where PartitionAlloc replaces that function.
++
++// Required to apply weak linkage to symbols.
++//
++// TODO(https://crbug.com/410596442): Stop using unstable features here.
++// https://github.com/rust-lang/rust/issues/29603 tracks stabilization of the `linkage` feature.
++#![feature(linkage)]
++// Required to apply `#[rustc_std_internal_symbol]` to our alloc error handler
++// so the name is correctly mangled as rustc expects.
++//
++// TODO(https://crbug.com/410596442): Stop using internal features here.
++#![allow(internal_features)]
++#![feature(rustc_attrs)]
++
++// This module is in a separate source file to avoid having to teach `cxxbridge`
++// about conditional compilation.
++#[cfg(rust_allocator_uses_allocator_impls_h)]
++mod allocator_impls_ffi;
++
++/// Module that provides `#[global_allocator]` / `GlobalAlloc` interface for
++/// using an allocator from C++.
++#[cfg(rust_allocator_uses_allocator_impls_h)]
++mod cpp_allocator {
++ use super::allocator_impls_ffi::ffi;
++ use std::alloc::{GlobalAlloc, Layout};
++
++ struct Allocator;
++
++ unsafe impl GlobalAlloc for Allocator {
++ unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
++ unsafe { ffi::alloc(layout.size(), layout.align()) }
++ }
++
++ unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
++ unsafe {
++ ffi::dealloc(ptr, layout.size(), layout.align());
++ }
++ }
++
++ unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
++ unsafe { ffi::alloc_zeroed(layout.size(), layout.align()) }
++ }
++
++ unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
++ unsafe { ffi::realloc(ptr, layout.size(), layout.align(), new_size) }
++ }
++ }
++
++ #[global_allocator]
++ static GLOBAL: Allocator = Allocator;
++}
++
++/// Module that provides `#[global_allocator]` / `GlobalAlloc` interface for
++/// using the default Rust allocator.
++#[cfg(not(rust_allocator_uses_allocator_impls_h))]
++mod rust_allocator {
++ #[global_allocator]
++ static GLOBAL: std::alloc::System = std::alloc::System;
++}
++
++/// Module that provides global symbols that are needed both by `cpp_allocator`
++/// and `rust_allocator`.
++///
++/// When `rustc` drives linking, then it will define the symbols below. But
++/// Chromium only uses `rustc` to link Rust-only executables (e.g. `build.rs`
++/// scripts) and otherwise uses a non-Rust linker. This is why we have to
++/// manually define a few symbols below. We define those symbols
++/// as "weak" symbols, so that Rust-provided symbols "win" in case where Rust
++/// actually does drive the linking. This hack works (not only for Chromium,
++/// but also for google3 and other projects), but isn't officially supported by
++/// `rustc`.
++///
++/// TODO(https://crbug.com/410596442): Stop using internal features here.
++mod both_allocators {
++ /// As part of rustc's contract for using `#[global_allocator]` without
++ /// rustc-generated shims we must define this symbol, since we are opting in
++ /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
++ #[no_mangle]
++ #[linkage = "weak"]
++ static __rust_no_alloc_shim_is_unstable: u8 = 0;
++
++ // Mangle the symbol name as rustc expects.
++ #[rustc_std_internal_symbol]
++ #[allow(non_upper_case_globals)]
++ #[linkage = "weak"]
++ static __rust_alloc_error_handler_should_panic: u8 = 0;
++
++ // Mangle the symbol name as rustc expects.
++ #[rustc_std_internal_symbol]
++ #[allow(non_upper_case_globals)]
++ #[linkage = "weak"]
++ fn __rust_alloc_error_handler(_size: usize, _align: usize) {
++ // TODO(lukasza): Investigate if we can just call `std::process::abort()` here.
++ // (Not really _needed_, but it could simplify code a little bit.)
++ unsafe { ffi::alloc_error_handler_impl() }
++ }
++
++ #[cxx::bridge(namespace = "rust_allocator_internal")]
++ mod ffi {
++ extern "C++" {
++ include!("build/rust/allocator/alloc_error_handler_impl.h");
++ unsafe fn alloc_error_handler_impl();
++ }
++ }
++}
diff --git a/www/chromium/files/patch-build_rust_cargo__crate.gni b/www/chromium/files/patch-build_rust_cargo__crate.gni
new file mode 100644
index 000000000000..a1590f727aa3
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_cargo__crate.gni
@@ -0,0 +1,25 @@
+--- build/rust/cargo_crate.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/cargo_crate.gni
+@@ -259,6 +259,12 @@ template("cargo_crate") {
+ # Don't import the `chromium` crate into third-party code.
+ no_chromium_prelude = true
+
++ # Don't depend on the chrome-specific #[global_allocator] crate from
++ # third-party code. This avoids some dependency cycle issues. The allocator
++ # crate will still be used if it exists anywhere in the dependency graph for
++ # a given linked artifact.
++ no_allocator_crate = true
++
+ rustc_metadata = _rustc_metadata
+
+ # TODO(crbug.com/40259764): don't default to true. This requires changes to
+@@ -482,6 +488,9 @@ template("cargo_crate") {
+
+ # Don't import the `chromium` crate into third-party code.
+ no_chromium_prelude = true
++
++ # Build scripts do not need to link to chrome's allocator.
++ no_allocator_crate = true
+
+ # The ${_build_script_name}_output target looks for the exe in this
+ # location. Due to how the Windows component build works, this has to
diff --git a/www/chromium/files/patch-build_rust_rust__macro.gni b/www/chromium/files/patch-build_rust_rust__macro.gni
new file mode 100644
index 000000000000..0dafc3819aa1
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_rust__macro.gni
@@ -0,0 +1,12 @@
+--- build/rust/rust_macro.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/rust_macro.gni
+@@ -16,6 +16,9 @@ template("rust_macro") {
+ forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
+ proc_macro_configs = invoker.configs
+ target_type = "rust_proc_macro"
++
++ # Macros are loaded by rustc and shouldn't use chrome's allocation routines.
++ no_allocator_crate = true
+ }
+ }
+
diff --git a/www/chromium/files/patch-build_rust_rust__target.gni b/www/chromium/files/patch-build_rust_rust__target.gni
new file mode 100644
index 000000000000..f4ad6f04fc45
--- /dev/null
+++ b/www/chromium/files/patch-build_rust_rust__target.gni
@@ -0,0 +1,13 @@
+--- build/rust/rust_target.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/rust_target.gni
+@@ -339,6 +339,10 @@ template("rust_target") {
+ _rust_deps += [ "//build/rust/std" ]
+ }
+
++ if (!defined(invoker.no_allocator_crate) || !invoker.no_allocator_crate) {
++ _rust_deps += [ "//build/rust/allocator" ]
++ }
++
+ if (_build_unit_tests) {
+ _unit_test_target = "${_target_name}_unittests"
+ if (defined(invoker.unit_test_target)) {
diff --git a/www/chromium/files/patch-build_rust_std_BUILD.gn b/www/chromium/files/patch-build_rust_std_BUILD.gn
index 0a5335d58d48..c6c2801bd47d 100644
--- a/www/chromium/files/patch-build_rust_std_BUILD.gn
+++ b/www/chromium/files/patch-build_rust_std_BUILD.gn
@@ -1,6 +1,58 @@
---- build/rust/std/BUILD.gn.orig 2025-04-05 13:54:50 UTC
+--- build/rust/std/BUILD.gn.orig 2025-05-20 09:16:26 UTC
+++ build/rust/std/BUILD.gn
-@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
+@@ -15,51 +15,12 @@
+ # allocator functions to PartitionAlloc when `use_partition_alloc_as_malloc` is
+ # true, so that Rust and C++ use the same allocator backend.
+
+-import("//build/buildflag_header.gni")
+ import("//build/config/compiler/compiler.gni")
+ import("//build/config/coverage/coverage.gni")
+ import("//build/config/rust.gni")
+ import("//build/config/sanitizers/sanitizers.gni")
+
+-rust_allocator_uses_partition_alloc = false
+-if (build_with_chromium) {
+- import("//base/allocator/partition_allocator/partition_alloc.gni")
+- rust_allocator_uses_partition_alloc = use_partition_alloc_as_malloc
+-}
+-
+-buildflag_header("buildflags") {
+- header = "buildflags.h"
+- flags = [
+- "RUST_ALLOCATOR_USES_PARTITION_ALLOC=$rust_allocator_uses_partition_alloc",
+- ]
+- visibility = [ ":*" ]
+-}
+-
+ if (toolchain_has_rust) {
+- # If clang performs the link step, we need to provide the allocator symbols
+- # that are normally injected by rustc during linking.
+- #
+- # We also "happen to" use this to redirect allocations to PartitionAlloc,
+- # though that would be better done through a #[global_allocator] crate (see
+- # above).
+- source_set("remap_alloc") {
+- public_deps = []
+- if (rust_allocator_uses_partition_alloc) {
+- public_deps += [ "//base/allocator/partition_allocator:partition_alloc" ]
+- }
+- deps = [ ":buildflags" ]
+- sources = [
+- # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
+- # copied from `//base`.
+- # TODO(crbug.com/40279749): Avoid duplication / reuse code.
+- "alias.cc",
+- "alias.h",
+- "compiler_specific.h",
+- "immediate_crash.h",
+- "remap_alloc.cc",
+- ]
+- }
+-
+ # List of Rust stdlib rlibs which are present in the official Rust toolchain
+ # we are using from the Android team. This is usually a version or two behind
+ # nightly. Generally this matches the toolchain we build ourselves, but if
+@@ -89,13 +50,20 @@ if (toolchain_has_rust) {
# These are no longer present in the Windows toolchain.
stdlib_files += [
"addr2line",
@@ -22,7 +74,7 @@
}
if (toolchain_for_rust_host_build_tools) {
-@@ -115,7 +122,6 @@ if (toolchain_has_rust) {
+@@ -115,7 +83,6 @@ if (toolchain_has_rust) {
# don't need to pass to the C++ linker because they're used for specialized
# purposes.
skip_stdlib_files = [
@@ -30,3 +82,25 @@
"rustc_std_workspace_alloc",
"rustc_std_workspace_core",
"rustc_std_workspace_std",
+@@ -269,8 +236,6 @@ if (toolchain_has_rust) {
+ foreach(libname, stdlib_files + skip_stdlib_files) {
+ deps += [ "rules:$libname" ]
+ }
+-
+- public_deps = [ ":remap_alloc" ]
+ }
+ } else {
+ action("find_stdlib") {
+@@ -396,12 +361,6 @@ if (toolchain_has_rust) {
+ ":stdlib_public_dependent_libs",
+ ]
+ deps = [ ":prebuilt_rustc_copy_to_sysroot" ]
+-
+- # The host builds tools toolchain supports Rust only and does not use
+- # the allocator remapping to point it to PartitionAlloc.
+- if (!toolchain_for_rust_host_build_tools) {
+- deps += [ ":remap_alloc" ]
+- }
+ }
+ }
+ }
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 a797353d5556..919aec74e31b 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,4 +1,4 @@
---- 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.orig 2025-05-15 08:40:59 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -434,7 +434,7 @@
name: "AppTitle",
@@ -45,7 +45,7 @@
status: "stable",
public: true,
base_feature: "none",
-@@ -4636,7 +4636,7 @@
+@@ -4635,7 +4635,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
-@@ -4811,7 +4811,7 @@
+@@ -4810,7 +4810,7 @@
{
name: "WebAppScopeExtensions",
origin_trial_feature_name: "WebAppScopeExtensions",
@@ -63,7 +63,7 @@
status: "experimental",
base_feature: "none",
},
-@@ -5086,7 +5086,7 @@
+@@ -5085,7 +5085,7 @@
{
name: "WebIdentityDigitalCredentials",
origin_trial_feature_name: "WebIdentityDigitalCredentials",
diff --git a/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
new file mode 100644
index 000000000000..e106ca3408e3
--- /dev/null
+++ b/www/chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
@@ -0,0 +1,13 @@
+--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-05-13 08:59:54 UTC
++++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc
+@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC
+ surface->UpdateBufferDamageRegion(
+ gfx::ToEnclosingRectIgnoringError(surface_damage));
+
++#if !BUILDFLAG(IS_BSD)
+ if (!config.access_fence_handle.is_null())
+ surface->set_acquire_fence(std::move(config.access_fence_handle));
++#endif
+
+ bool needs_commit = false;
+
diff --git a/www/cinny/Makefile b/www/cinny/Makefile
index 3cc9d1de44dd..4805f2e2c7b0 100644
--- a/www/cinny/Makefile
+++ b/www/cinny/Makefile
@@ -1,6 +1,6 @@
PORTNAME= cinny
DISTVERSIONPREFIX= v
-DISTVERSION= 4.6.0
+DISTVERSION= 4.7.0
CATEGORIES= www
MASTER_SITES= https://github.com/ajbura/${PORTNAME}/releases/download/v${PORTVERSION}/
diff --git a/www/cinny/distinfo b/www/cinny/distinfo
index 9d59ff672d52..34f8cbc0d4f5 100644
--- a/www/cinny/distinfo
+++ b/www/cinny/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745058438
-SHA256 (cinny-v4.6.0.tar.gz) = ee14cb067618e457b57c3941a80236ef280033955ea5fcdfe49d0c24b0dc6b9a
-SIZE (cinny-v4.6.0.tar.gz) = 10673263
+TIMESTAMP = 1747576427
+SHA256 (cinny-v4.7.0.tar.gz) = 99bf0f035bc47d2838ec284075e1a32a746ac43511f7120a983d147efbf7b9b9
+SIZE (cinny-v4.7.0.tar.gz) = 5582987
diff --git a/www/cinny/pkg-plist b/www/cinny/pkg-plist
index 426d948d7b60..9e01b8b43142 100644
--- a/www/cinny/pkg-plist
+++ b/www/cinny/pkg-plist
@@ -1,5 +1,5 @@
-%%WWWDIR%%/assets/ReactPrism-B-o03VQe.js
-%%WWWDIR%%/assets/ReactPrism-B-o03VQe.js.map
+%%WWWDIR%%/assets/ReactPrism-BerGavVz.js
+%%WWWDIR%%/assets/ReactPrism-BerGavVz.js.map
%%WWWDIR%%/assets/ReactPrism-GaPGjdOJ.css
%%WWWDIR%%/assets/Twemoji.Mozilla.v15.1.0-CM1RS90w.woff2
%%WWWDIR%%/assets/Twemoji.Mozilla.v15.1.0-DHQZm25T.ttf
@@ -14,13 +14,13 @@
%%WWWDIR%%/assets/apple-touch-icon-72x72-BiCSJ3dR.png
%%WWWDIR%%/assets/apple-touch-icon-76x76-GfaoCnSQ.png
%%WWWDIR%%/assets/favicon-5KspoOBy.ico
+%%WWWDIR%%/assets/index-4OWSgzB9.js
+%%WWWDIR%%/assets/index-4OWSgzB9.js.map
%%WWWDIR%%/assets/index-B9fWrEk-.js
%%WWWDIR%%/assets/index-B9fWrEk-.js.map
-%%WWWDIR%%/assets/index-BF6FXjZx.js
-%%WWWDIR%%/assets/index-BF6FXjZx.js.map
%%WWWDIR%%/assets/index-BIQoOb9a.css
-%%WWWDIR%%/assets/index-siqr4xob.js
-%%WWWDIR%%/assets/index-siqr4xob.js.map
+%%WWWDIR%%/assets/index-CT60ZVgd.js
+%%WWWDIR%%/assets/index-CT60ZVgd.js.map
%%WWWDIR%%/assets/inter-cyrillic-ext-variable-wghtOnly-normal-CBYe6022.woff2
%%WWWDIR%%/assets/inter-cyrillic-variable-wghtOnly-normal-DHeaknKs.woff2
%%WWWDIR%%/assets/inter-greek-ext-variable-wghtOnly-normal-vpOIeGzY.woff2
@@ -29,9 +29,10 @@
%%WWWDIR%%/assets/inter-latin-variable-wghtOnly-normal-DwMxL0mc.woff2
%%WWWDIR%%/assets/inter-vietnamese-variable-wghtOnly-normal-CZXuW_xV.woff2
%%WWWDIR%%/assets/invite-DROg5x7-.ogg
+%%WWWDIR%%/assets/matrix_sdk_crypto_wasm_bg-BKhMui86.wasm
%%WWWDIR%%/assets/notification-EtLMRd0T.ogg
-%%WWWDIR%%/assets/pdf-DTU2FXqc.js
-%%WWWDIR%%/assets/pdf-DTU2FXqc.js.map
+%%WWWDIR%%/assets/pdf-Gqh3aXa8.js
+%%WWWDIR%%/assets/pdf-Gqh3aXa8.js.map
%%WWWDIR%%/config.json.example
%%WWWDIR%%/index.html
%%WWWDIR%%/manifest.json
diff --git a/www/dokuwiki/Makefile b/www/dokuwiki/Makefile
index eb1c2bda90f8..bb4f18db5594 100644
--- a/www/dokuwiki/Makefile
+++ b/www/dokuwiki/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING
LICENSE_FILE_GPLv2+ = ${WRKSRC}/vendor/geshi/geshi/LICENSE
LICENSE_FILE_MIT= ${WRKSRC}/vendor/composer/LICENSE
-DIST_VER= ${PORTNAME}-2024-02-06b
+DIST_VER= ${PORTNAME}-2025-05-14
USES= cpe php:web,flavors shebangfix tar:tgz
USE_PHP= ctype filter gd iconv mbstring ldap pdo_mysql session simplexml xml zlib
NO_ARCH= YES
diff --git a/www/dokuwiki/distinfo b/www/dokuwiki/distinfo
index 4761b07e5644..68ad36c6e7b1 100644
--- a/www/dokuwiki/distinfo
+++ b/www/dokuwiki/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722925621
-SHA256 (dokuwiki-2024-02-06b.tgz) = 7ac919bc298c049af15764f3563ec3012cd158945ef2a22348684df701a19ba3
-SIZE (dokuwiki-2024-02-06b.tgz) = 4206676
+TIMESTAMP = 1747474694
+SHA256 (dokuwiki-2025-05-14.tgz) = b913bf2cbea6fe9956c32572837617d4d8ee766d122155eb4722b24d526dacd4
+SIZE (dokuwiki-2025-05-14.tgz) = 4251299
diff --git a/www/dokuwiki/pkg-plist b/www/dokuwiki/pkg-plist
index 21f45af86def..d4dab2c95ada 100644
--- a/www/dokuwiki/pkg-plist
+++ b/www/dokuwiki/pkg-plist
@@ -131,8 +131,9 @@
%%WWWDIR%%/inc/Feed/FeedItemProcessor.php
%%WWWDIR%%/inc/Feed/FeedMediaProcessor.php
%%WWWDIR%%/inc/Feed/FeedPageProcessor.php
-%%WWWDIR%%/inc/FeedParser.php
-%%WWWDIR%%/inc/FeedParserFile.php
+%%WWWDIR%%/inc/Feed/FeedParser.php
+%%WWWDIR%%/inc/Feed/FeedParserFile.php
+%%WWWDIR%%/inc/Feed/FeedParserItem.php
%%WWWDIR%%/inc/File/MediaFile.php
%%WWWDIR%%/inc/File/MediaResolver.php
%%WWWDIR%%/inc/File/PageFile.php
@@ -164,6 +165,7 @@
%%WWWDIR%%/inc/Input/Input.php
%%WWWDIR%%/inc/Input/Post.php
%%WWWDIR%%/inc/Input/Server.php
+%%WWWDIR%%/inc/Ip.php
%%WWWDIR%%/inc/JWT.php
%%WWWDIR%%/inc/JpegMeta.php
%%WWWDIR%%/inc/Logger.php
@@ -279,6 +281,16 @@
%%WWWDIR%%/inc/Subscriptions/SubscriberRegexBuilder.php
%%WWWDIR%%/inc/Subscriptions/SubscriptionSender.php
%%WWWDIR%%/inc/TaskRunner.php
+%%WWWDIR%%/inc/TreeBuilder/AbstractBuilder.php
+%%WWWDIR%%/inc/TreeBuilder/ControlPageBuilder.php
+%%WWWDIR%%/inc/TreeBuilder/Node/AbstractNode.php
+%%WWWDIR%%/inc/TreeBuilder/Node/ExternalLink.php
+%%WWWDIR%%/inc/TreeBuilder/Node/Top.php
+%%WWWDIR%%/inc/TreeBuilder/Node/WikiNamespace.php
+%%WWWDIR%%/inc/TreeBuilder/Node/WikiPage.php
+%%WWWDIR%%/inc/TreeBuilder/Node/WikiStartpage.php
+%%WWWDIR%%/inc/TreeBuilder/PageTreeBuilder.php
+%%WWWDIR%%/inc/TreeBuilder/TreeSort.php
%%WWWDIR%%/inc/Ui/Admin.php
%%WWWDIR%%/inc/Ui/Backlinks.php
%%WWWDIR%%/inc/Ui/Diff.php
@@ -497,6 +509,10 @@
%%WWWDIR%%/inc/lang/bn/editrev.txt
%%WWWDIR%%/inc/lang/bn/index.txt
%%WWWDIR%%/inc/lang/bn/lang.php
+%%WWWDIR%%/inc/lang/br/admin.txt
+%%WWWDIR%%/inc/lang/br/adminplugins.txt
+%%WWWDIR%%/inc/lang/br/backlinks.txt
+%%WWWDIR%%/inc/lang/br/conflict.txt
%%WWWDIR%%/inc/lang/ca-valencia/admin.txt
%%WWWDIR%%/inc/lang/ca-valencia/adminplugins.txt
%%WWWDIR%%/inc/lang/ca-valencia/backlinks.txt
@@ -1742,6 +1758,9 @@
%%WWWDIR%%/inc/lang/mk/recent.txt
%%WWWDIR%%/inc/lang/mk/showrev.txt
%%WWWDIR%%/inc/lang/ml/admin.txt
+%%WWWDIR%%/inc/lang/ml/adminplugins.txt
+%%WWWDIR%%/inc/lang/ml/backlinks.txt
+%%WWWDIR%%/inc/lang/ml/conflict.txt
%%WWWDIR%%/inc/lang/ml/jquery.ui.datepicker.js
%%WWWDIR%%/inc/lang/mr/admin.txt
%%WWWDIR%%/inc/lang/mr/backlinks.txt
@@ -3277,6 +3296,7 @@
%%WWWDIR%%/lib/plugins/authpdo/lang/uk/settings.php
%%WWWDIR%%/lib/plugins/authpdo/lang/vi/lang.php
%%WWWDIR%%/lib/plugins/authpdo/lang/vi/settings.php
+%%WWWDIR%%/lib/plugins/authpdo/lang/zh-tw/lang.php
%%WWWDIR%%/lib/plugins/authpdo/lang/zh/lang.php
%%WWWDIR%%/lib/plugins/authpdo/lang/zh/settings.php
%%WWWDIR%%/lib/plugins/authpdo/plugin.info.txt
@@ -3507,9 +3527,27 @@
%%WWWDIR%%/lib/plugins/config/plugin.info.txt
%%WWWDIR%%/lib/plugins/config/settings/config.metadata.php
%%WWWDIR%%/lib/plugins/config/style.css
-%%WWWDIR%%/lib/plugins/extension/_test/extension.test.php
+%%WWWDIR%%/lib/plugins/extension/Exception.php
+%%WWWDIR%%/lib/plugins/extension/Extension.php
+%%WWWDIR%%/lib/plugins/extension/Gui.php
+%%WWWDIR%%/lib/plugins/extension/GuiAdmin.php
+%%WWWDIR%%/lib/plugins/extension/GuiExtension.php
+%%WWWDIR%%/lib/plugins/extension/Installer.php
+%%WWWDIR%%/lib/plugins/extension/Local.php
+%%WWWDIR%%/lib/plugins/extension/Manager.php
+%%WWWDIR%%/lib/plugins/extension/Notice.php
+%%WWWDIR%%/lib/plugins/extension/Repository.php
+%%WWWDIR%%/lib/plugins/extension/_test/ExtensionTest.php
+%%WWWDIR%%/lib/plugins/extension/_test/InstallerTest.php
+%%WWWDIR%%/lib/plugins/extension/_test/LocalTest.php
+%%WWWDIR%%/lib/plugins/extension/_test/ManagerTest.php
%%WWWDIR%%/lib/plugins/extension/_test/testdata/either1/script.js
%%WWWDIR%%/lib/plugins/extension/_test/testdata/eithersub2/either2/script.js
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mpl1/plugin.info.txt
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mpl2/plugin.info.txt
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mpl3/plugin.info.txt
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mtpl4/template.info.txt
+%%WWWDIR%%/lib/plugins/extension/_test/testdata/multi/mtpl5/template.info.txt
%%WWWDIR%%/lib/plugins/extension/_test/testdata/plgfoo5/plugin.info.txt
%%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub3/plugin3/syntax.php
%%WWWDIR%%/lib/plugins/extension/_test/testdata/plgsub4/plugin4/plugin.info.txt
@@ -3527,25 +3565,20 @@
%%WWWDIR%%/lib/plugins/extension/action.php
%%WWWDIR%%/lib/plugins/extension/admin.php
%%WWWDIR%%/lib/plugins/extension/admin.svg
-%%WWWDIR%%/lib/plugins/extension/all.less
%%WWWDIR%%/lib/plugins/extension/cli.php
-%%WWWDIR%%/lib/plugins/extension/helper/extension.php
-%%WWWDIR%%/lib/plugins/extension/helper/gui.php
-%%WWWDIR%%/lib/plugins/extension/helper/list.php
-%%WWWDIR%%/lib/plugins/extension/helper/repository.php
-%%WWWDIR%%/lib/plugins/extension/images/bug.gif
-%%WWWDIR%%/lib/plugins/extension/images/disabled.png
-%%WWWDIR%%/lib/plugins/extension/images/donate.png
-%%WWWDIR%%/lib/plugins/extension/images/down.png
-%%WWWDIR%%/lib/plugins/extension/images/enabled.png
+%%WWWDIR%%/lib/plugins/extension/helper.php
+%%WWWDIR%%/lib/plugins/extension/images/bug.svg
+%%WWWDIR%%/lib/plugins/extension/images/coffee.svg
+%%WWWDIR%%/lib/plugins/extension/images/error.svg
+%%WWWDIR%%/lib/plugins/extension/images/fire.svg
%%WWWDIR%%/lib/plugins/extension/images/icons.xcf
+%%WWWDIR%%/lib/plugins/extension/images/info.svg
%%WWWDIR%%/lib/plugins/extension/images/license.txt
%%WWWDIR%%/lib/plugins/extension/images/overlay.png
%%WWWDIR%%/lib/plugins/extension/images/plugin.png
-%%WWWDIR%%/lib/plugins/extension/images/tag.png
+%%WWWDIR%%/lib/plugins/extension/images/security.svg
%%WWWDIR%%/lib/plugins/extension/images/template.png
-%%WWWDIR%%/lib/plugins/extension/images/up.png
-%%WWWDIR%%/lib/plugins/extension/images/warning.png
+%%WWWDIR%%/lib/plugins/extension/images/warning.svg
%%WWWDIR%%/lib/plugins/extension/lang/bg/intro_install.txt
%%WWWDIR%%/lib/plugins/extension/lang/bg/intro_plugins.txt
%%WWWDIR%%/lib/plugins/extension/lang/bg/intro_search.txt
@@ -3639,6 +3672,7 @@
%%WWWDIR%%/lib/plugins/extension/lang/ko/intro_search.txt
%%WWWDIR%%/lib/plugins/extension/lang/ko/intro_templates.txt
%%WWWDIR%%/lib/plugins/extension/lang/ko/lang.php
+%%WWWDIR%%/lib/plugins/extension/lang/lt/lang.php
%%WWWDIR%%/lib/plugins/extension/lang/lv/intro_templates.txt
%%WWWDIR%%/lib/plugins/extension/lang/lv/lang.php
%%WWWDIR%%/lib/plugins/extension/lang/nl/intro_install.txt
@@ -3718,9 +3752,13 @@
%%WWWDIR%%/lib/plugins/logviewer/lang/fr/intro.txt
%%WWWDIR%%/lib/plugins/logviewer/lang/fr/lang.php
%%WWWDIR%%/lib/plugins/logviewer/lang/fr/nolog.txt
+%%WWWDIR%%/lib/plugins/logviewer/lang/hu/intro.txt
%%WWWDIR%%/lib/plugins/logviewer/lang/hu/lang.php
+%%WWWDIR%%/lib/plugins/logviewer/lang/hu/nolog.txt
%%WWWDIR%%/lib/plugins/logviewer/lang/it/lang.php
%%WWWDIR%%/lib/plugins/logviewer/lang/ja/lang.php
+%%WWWDIR%%/lib/plugins/logviewer/lang/ko/intro.txt
+%%WWWDIR%%/lib/plugins/logviewer/lang/ko/lang.php
%%WWWDIR%%/lib/plugins/logviewer/lang/pl/intro.txt
%%WWWDIR%%/lib/plugins/logviewer/lang/pl/lang.php
%%WWWDIR%%/lib/plugins/logviewer/lang/pl/nolog.txt
@@ -3733,6 +3771,7 @@
%%WWWDIR%%/lib/plugins/logviewer/lang/ru/intro.txt
%%WWWDIR%%/lib/plugins/logviewer/lang/ru/lang.php
%%WWWDIR%%/lib/plugins/logviewer/lang/ru/nolog.txt
+%%WWWDIR%%/lib/plugins/logviewer/lang/sk/lang.php
%%WWWDIR%%/lib/plugins/logviewer/lang/vi/intro.txt
%%WWWDIR%%/lib/plugins/logviewer/lang/vi/lang.php
%%WWWDIR%%/lib/plugins/logviewer/lang/vi/nolog.txt
@@ -4441,6 +4480,7 @@
%%WWWDIR%%/lib/scripts/jquery/update.sh
%%WWWDIR%%/lib/scripts/jquery/versions
%%WWWDIR%%/lib/scripts/linkwiz.js
+%%WWWDIR%%/lib/scripts/linkwiz.test.js
%%WWWDIR%%/lib/scripts/locktimer.js
%%WWWDIR%%/lib/scripts/media.js
%%WWWDIR%%/lib/scripts/page.js
@@ -4562,6 +4602,8 @@
%%WWWDIR%%/lib/tpl/dokuwiki/lang/sk/lang.php
%%WWWDIR%%/lib/tpl/dokuwiki/lang/sk/style.txt
%%WWWDIR%%/lib/tpl/dokuwiki/lang/sv/lang.php
+%%WWWDIR%%/lib/tpl/dokuwiki/lang/uk/lang.php
+%%WWWDIR%%/lib/tpl/dokuwiki/lang/uk/style.txt
%%WWWDIR%%/lib/tpl/dokuwiki/lang/vi/lang.php
%%WWWDIR%%/lib/tpl/dokuwiki/lang/vi/style.txt
%%WWWDIR%%/lib/tpl/dokuwiki/lang/zh-tw/style.txt
@@ -4753,7 +4795,7 @@
%%WWWDIR%%/vendor/geshi/geshi/src/geshi/netrexx.php
%%WWWDIR%%/vendor/geshi/geshi/src/geshi/newlisp.php
%%WWWDIR%%/vendor/geshi/geshi/src/geshi/nginx.php
-%%WWWDIR%%/vendor/geshi/geshi/src/geshi/nimrod.php
+%%WWWDIR%%/vendor/geshi/geshi/src/geshi/nim.php
%%WWWDIR%%/vendor/geshi/geshi/src/geshi/nsis.php
%%WWWDIR%%/vendor/geshi/geshi/src/geshi/oberon2.php
%%WWWDIR%%/vendor/geshi/geshi/src/geshi/objc.php
@@ -4893,6 +4935,7 @@
%%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/GPXCreator.php
%%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/HTMLCreator.php
%%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/JSCreator.php
+%%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/JSONCreator.php
%%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/KMLCreator.php
%%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/MBOXCreator.php
%%WWWDIR%%/vendor/openpsa/universalfeedcreator/lib/Creator/OPMLCreator.php
@@ -4927,6 +4970,16 @@
%%WWWDIR%%/vendor/paragonie/random_compat/lib/random.php
%%WWWDIR%%/vendor/paragonie/random_compat/psalm-autoload.php
%%WWWDIR%%/vendor/paragonie/random_compat/psalm.xml
+%%WWWDIR%%/vendor/php81_bc/strftime/.editorconfig
+%%WWWDIR%%/vendor/php81_bc/strftime/LICENSE
+%%WWWDIR%%/vendor/php81_bc/strftime/README.md
+%%WWWDIR%%/vendor/php81_bc/strftime/autoload.php
+%%WWWDIR%%/vendor/php81_bc/strftime/composer.json
+%%WWWDIR%%/vendor/php81_bc/strftime/example.php
+%%WWWDIR%%/vendor/php81_bc/strftime/src/AbstractLocaleFormatter.php
+%%WWWDIR%%/vendor/php81_bc/strftime/src/DateLocaleFormatter.php
+%%WWWDIR%%/vendor/php81_bc/strftime/src/IntlLocaleFormatter.php
+%%WWWDIR%%/vendor/php81_bc/strftime/src/php-8.1-strftime.php
%%WWWDIR%%/vendor/phpseclib/phpseclib/AUTHORS
%%WWWDIR%%/vendor/phpseclib/phpseclib/BACKERS.md
%%WWWDIR%%/vendor/phpseclib/phpseclib/LICENSE
@@ -5093,8 +5146,10 @@
%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/FileNotFoundException.php
%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/InconsistentSetupException.php
%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/InsufficientSetupException.php
+%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/InvalidPacketLengthException.php
%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/NoKeyLoadedException.php
%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/NoSupportedAlgorithmsException.php
+%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/TimeoutException.php
%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/UnableToConnectException.php
%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedAlgorithmException.php
%%WWWDIR%%/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedCurveException.php
diff --git a/www/domoticz-devel/Makefile b/www/domoticz-devel/Makefile
index e8954e448702..7f56841b2567 100644
--- a/www/domoticz-devel/Makefile
+++ b/www/domoticz-devel/Makefile
@@ -11,8 +11,6 @@ WWW= https://www.domoticz.com
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/License.txt
-BROKEN= fails to build with Boost>=1.87
-
LIB_DEPENDS= libcurl.so:ftp/curl \
libboost_system.so:devel/boost-libs \
libjsoncpp.so:devel/jsoncpp \
diff --git a/www/domoticz-devel/files/patch-pr6252 b/www/domoticz-devel/files/patch-pr6252
new file mode 100644
index 000000000000..34c4efd3f4e4
--- /dev/null
+++ b/www/domoticz-devel/files/patch-pr6252
@@ -0,0 +1,2178 @@
+Fix for boost 1.87
+
+Removed the diff for the msbuild project files, didn't apply cleanly and not relevant anyway.
+This will merged in the next stable of domoticz.
+
+Pullrequest: https://github.com/domoticz/domoticz/pull/6252
+Patch: https://patch-diff.githubusercontent.com/raw/domoticz/domoticz/pull/6252.patch-diff
+
+diff --git hardware/ASyncSerial.cpp hardware/ASyncSerial.cpp
+index 52c950d..6147cdb 100644
+--- hardware/ASyncSerial.cpp
++++ hardware/ASyncSerial.cpp
+@@ -54,7 +54,7 @@ public:
+ {
+ }
+
+- boost::asio::io_service io; ///< Io service object
++ boost::asio::io_context io; ///< Io service object
+ boost::asio::serial_port port; ///< Serial port object
+ boost::thread backgroundThread; ///< Thread that runs read/write operations
+ bool open{ false }; ///< True if port open
+@@ -117,10 +117,10 @@ void AsyncSerial::open(const std::string& devname, unsigned int baud_rate,
+ throw;
+ }
+
+- pimpl->io.reset();
++ pimpl->io.restart();
+
+- // This gives some work to the io_service before it is started
+- pimpl->io.post([this] { return doRead(); });
++ // This gives some work to the io_context before it is started
++ boost::asio::post(pimpl->io, [this] { return doRead(); });
+
+ boost::thread t([p = &pimpl->io] { p->run(); });
+ pimpl->backgroundThread.swap(t);
+@@ -149,10 +149,10 @@ void AsyncSerial::openOnlyBaud(const std::string& devname, unsigned int baud_rat
+ throw;
+ }
+
+- pimpl->io.reset();
++ pimpl->io.restart();
+
+- //This gives some work to the io_service before it is started
+- pimpl->io.post([this] { return doRead(); });
++ //This gives some work to the io_context before it is started
++ boost::asio::post(pimpl->io, [this] { return doRead(); });
+
+ boost::thread t([p = &pimpl->io] { p->run(); });
+ pimpl->backgroundThread.swap(t);
+@@ -176,9 +176,9 @@ void AsyncSerial::close()
+ if(!isOpen()) return;
+
+ pimpl->open = false;
+- pimpl->io.post([this] { doClose(); });
++ boost::asio::post(pimpl->io, [this] { doClose(); });
+ pimpl->backgroundThread.join();
+- pimpl->io.reset();
++ pimpl->io.restart();
+ if(errorStatus())
+ {
+ throw(boost::system::system_error(boost::system::error_code(),
+@@ -192,7 +192,7 @@ void AsyncSerial::write(const char *data, size_t size)
+ std::lock_guard<std::mutex> l(pimpl->writeQueueMutex);
+ pimpl->writeQueue.insert(pimpl->writeQueue.end(),data,data+size);
+ }
+- pimpl->io.post([this] { doWrite(); });
++ boost::asio::post(pimpl->io, [this] { doWrite(); });
+ }
+
+ void AsyncSerial::write(const std::string &data)
+@@ -201,7 +201,7 @@ void AsyncSerial::write(const std::string &data)
+ std::lock_guard<std::mutex> l(pimpl->writeQueueMutex);
+ pimpl->writeQueue.insert(pimpl->writeQueue.end(), data.c_str(), data.c_str()+data.size());
+ }
+- pimpl->io.post([this] { doWrite(); });
++ boost::asio::post(pimpl->io, [this] { doWrite(); });
+ }
+
+ void AsyncSerial::write(const std::vector<char>& data)
+@@ -211,7 +211,7 @@ void AsyncSerial::write(const std::vector<char>& data)
+ pimpl->writeQueue.insert(pimpl->writeQueue.end(),data.begin(),
+ data.end());
+ }
+- pimpl->io.post([this] { doWrite(); });
++ boost::asio::post(pimpl->io, [this] { doWrite(); });
+ }
+
+ void AsyncSerial::writeString(const std::string& s)
+@@ -220,7 +220,7 @@ void AsyncSerial::writeString(const std::string& s)
+ std::lock_guard<std::mutex> l(pimpl->writeQueueMutex);
+ pimpl->writeQueue.insert(pimpl->writeQueue.end(),s.begin(),s.end());
+ }
+- pimpl->io.post([this] { doWrite(); });
++ boost::asio::post(pimpl->io, [this] { doWrite(); });
+ }
+
+ void AsyncSerial::doRead()
+diff --git hardware/ASyncSerial.h hardware/ASyncSerial.h
+index 0a51ef0..de83f8a 100644
+--- hardware/ASyncSerial.h
++++ hardware/ASyncSerial.h
+@@ -123,27 +123,27 @@ class AsyncSerial : private domoticz::noncopyable
+
+ /**
+ * Callback called to start an asynchronous read operation.
+- * This callback is called by the io_service in the spawned thread.
++ * This callback is called by the io_context in the spawned thread.
+ */
+ void doRead();
+
+ /**
+ * Callback called at the end of the asynchronous operation.
+- * This callback is called by the io_service in the spawned thread.
++ * This callback is called by the io_context in the spawned thread.
+ */
+ void readEnd(const boost::system::error_code &error, size_t bytes_transferred);
+
+ /**
+ * Callback called to start an asynchronous write operation.
+ * If it is already in progress, does nothing.
+- * This callback is called by the io_service in the spawned thread.
++ * This callback is called by the io_context in the spawned thread.
+ */
+ void doWrite();
+
+ /**
+ * Callback called at the end of an asynchronuous write operation,
+ * if there is more data to write, restarts a new write operation.
+- * This callback is called by the io_service in the spawned thread.
++ * This callback is called by the io_context in the spawned thread.
+ */
+ void writeEnd(const boost::system::error_code &error);
+
+diff --git hardware/ASyncTCP.cpp hardware/ASyncTCP.cpp
+index a375561..7c3b536 100644
+--- hardware/ASyncTCP.cpp
++++ hardware/ASyncTCP.cpp
+@@ -4,213 +4,241 @@
+ #include <boost/system/error_code.hpp> // for error_code
+ #include "../main/Logger.h"
+
+-struct hostent;
+-
+ #define MAX_TCP_BUFFER_SIZE 4096
+
+-#ifndef WIN32
+- #include <unistd.h> //gethostbyname
+-#endif
+-
+ #define STATUS_OK(err) !err
+-
+-ASyncTCP::ASyncTCP(const bool secure)
++#define STATUS_ERR(err) err
++
++ASyncTCP::ASyncTCP(const bool secure) :
++ m_Tcpwork(boost::asio::make_work_guard(m_io_context))
++ , m_Socket(m_io_context)
++ , m_Resolver(m_io_context)
++ , m_ReconnectTimer(m_io_context)
++ , m_TimeoutTimer(m_io_context)
++ , m_SendStrand(m_io_context)
+ #ifdef WWW_ENABLE_SSL
+- : mSecure(secure)
++ , m_bSecure(secure)
+ #endif
+ {
+ m_pRXBuffer = new uint8_t[MAX_TCP_BUFFER_SIZE];
+ #ifdef WWW_ENABLE_SSL
+ mContext.set_verify_mode(boost::asio::ssl::verify_none);
+- if (mSecure)
++ if (m_bSecure)
+ {
+- mSslSocket.reset(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(mIos, mContext));
++ m_SslSocket.reset(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(m_io_context, mContext));
+ }
+ #endif
+ }
+
+ ASyncTCP::~ASyncTCP()
+ {
+- assert(mTcpthread == nullptr);
+- mIsTerminating = true;
+- if (mTcpthread)
++ assert(m_Tcpthread == nullptr);
++ m_bIsTerminating = true;
++ if (m_Tcpthread)
+ {
+ //This should never happen. terminate() never called!!
+- _log.Log(LOG_ERROR, "ASyncTCP: Workerthread not closed. terminate() never called!!!");
+- mIos.stop();
+- if (mTcpthread)
++ _log.Log(LOG_ERROR, "ASyncTCP: Worker thread not closed. terminate() never called!!!");
++ m_io_context.stop();
++ if (m_Tcpthread)
+ {
+- mTcpthread->join();
+- mTcpthread.reset();
++ m_Tcpthread->join();
++ m_Tcpthread.reset();
+ }
+ }
+ if (m_pRXBuffer != nullptr)
+ delete[] m_pRXBuffer;
+ }
+
+-void ASyncTCP::SetReconnectDelay(int32_t Delay)
++void ASyncTCP::SetReconnectDelay(const int32_t Delay)
+ {
+- mReconnectDelay = Delay;
++ m_iReconnectDelay = Delay;
+ }
+
+ void ASyncTCP::connect(const std::string& ip, uint16_t port)
+ {
+- assert(!mSocket.is_open());
+- if (mSocket.is_open())
++ assert(!m_Socket.is_open());
++ if (m_Socket.is_open())
+ {
+ _log.Log(LOG_ERROR, "ASyncTCP: connect called while socket is still open. !!!");
+ terminate();
+ }
+
+- // RK: We reset mIos here because it might have been stopped in terminate()
+- mIos.reset();
+- // RK: After the reset, we need to provide it work anew
+- mTcpwork = std::make_shared<boost::asio::io_service::work>(mIos);
+- if (!mTcpthread)
+- mTcpthread = std::make_shared<std::thread>([p = &mIos] { p->run(); });
+-
+- mIp = ip;
+- mPort = port;
++ m_IP = ip;
++ m_Port = port;
+ std::string port_str = std::to_string(port);
+- boost::asio::ip::tcp::resolver::query query(ip, port_str);
+ timeout_start_timer();
+- mResolver.async_resolve(query, [this](auto &&err, auto &&iter) { cb_resolve_done(err, iter); });
++
++ m_Resolver.async_resolve(
++ ip, port_str,
++ [this](const boost::system::error_code& error, const boost::asio::ip::tcp::resolver::results_type& endpoints) {
++ handle_resolve(error, endpoints);
++ }
++ );
++
++ // RK: We restart m_io_context here because it might have been stopped in terminate()
++ m_io_context.restart();
++ // RK: After the reset, we need to provide it work anew
++ m_Tcpwork.reset();
++ m_Tcpwork.emplace(boost::asio::make_work_guard(m_io_context));
++ if (!m_Tcpthread)
++ m_Tcpthread = std::make_shared<std::thread>([p = &m_io_context] { p->run(); });
+ }
+
+-void ASyncTCP::cb_resolve_done(const boost::system::error_code& error, boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
++void ASyncTCP::handle_resolve(const boost::system::error_code& error, const boost::asio::ip::tcp::resolver::results_type &endpoints)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
+- {
+- connect_start(endpoint_iterator);
+- }
+- else
++ if (STATUS_ERR(error))
+ {
+ process_error(error);
++ return;
+ }
+-}
+-
+-void ASyncTCP::connect_start(boost::asio::ip::tcp::resolver::iterator& endpoint_iterator)
+-{
+- if (mIsConnected) return;
+-
+- mEndPoint = *endpoint_iterator++;
++ if (m_bIsConnected) return;
+
+ timeout_start_timer();
++
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
++ if (m_bSecure)
+ {
+ // we reset the ssl socket, because the ssl context needs to be reinitialized after a reconnect
+- mSslSocket.reset(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(mIos, mContext));
+- mSslSocket->lowest_layer().async_connect(mEndPoint, [this, endpoint_iterator](auto &&err) mutable { cb_connect_done(err, endpoint_iterator); });
++ m_SslSocket.reset(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(m_io_context, mContext));
++ boost::asio::async_connect(m_SslSocket->lowest_layer(), endpoints,
++ [this](const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& endpoint)
++ {
++ handle_connect(error, endpoint);
++ }
++ );
+ }
+ else
+ #endif
+ {
+- mSocket.async_connect(mEndPoint, [this, endpoint_iterator](auto &&err) mutable { cb_connect_done(err, endpoint_iterator); });
++ boost::asio::async_connect(m_Socket, endpoints,
++ [this](const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& endpoint)
++ {
++ handle_connect(error, endpoint);
++ }
++ );
+ }
+ }
+
+-void ASyncTCP::cb_connect_done(const boost::system::error_code& error, boost::asio::ip::tcp::resolver::iterator &endpoint_iterator)
++void ASyncTCP::handle_connect(const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& /*endpoint*/)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
++ if (STATUS_ERR(error))
+ {
++ process_error(error);
++ return;
++ }
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
+- {
+- timeout_start_timer();
+- mSslSocket->async_handshake(boost::asio::ssl::stream_base::client, [this](auto &&err) { cb_handshake_done(err); });
+- }
+- else
+-#endif
+- {
+- process_connection();
+- }
++ if (m_bSecure)
++ {
++ timeout_start_timer();
++ m_SslSocket->async_handshake(boost::asio::ssl::stream_base::client,
++ [this](const boost::system::error_code& error) {
++ cb_handshake_done(error);
++ }
++ );
+ }
+- else
++ else
++#endif
+ {
+- if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator())
+- {
+- // The connection failed. Try the next endpoint in the list.
+- connect_start(endpoint_iterator);
+- return;
+- }
+- process_error(error);
++ process_connection();
+ }
+ }
+
+ #ifdef WWW_ENABLE_SSL
+ void ASyncTCP::cb_handshake_done(const boost::system::error_code& error)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
+- {
+- process_connection();
+- }
+- else
++ if (STATUS_ERR(error))
+ {
+ process_error(error);
++ return;
+ }
++ process_connection();
++#endif
+ }
++
++void ASyncTCP::process_connection()
++{
++ m_bIsConnected = true;
++#ifdef WWW_ENABLE_SSL
++
++ if (!m_bSecure)
+ #endif
++ {
++ // RK: only if non-secure
++ boost::asio::socket_base::keep_alive option(true);
++ m_Socket.set_option(option);
++ }
++ OnConnect();
++ do_read_start();
++ do_write_start();
++}
+
+ void ASyncTCP::reconnect_start_timer()
+ {
+- if (mIsReconnecting) return;
++ if (m_bIsReconnecting) return;
+
+- if (mReconnectDelay != 0)
++ if (m_iReconnectDelay != 0)
+ {
+- mIsReconnecting = true;
+-
+- mReconnectTimer.expires_from_now(boost::posix_time::seconds(mReconnectDelay));
+- mReconnectTimer.async_wait([this](auto &&err) { cb_reconnect_start(err); });
++ m_bIsReconnecting = true;
++
++ m_ReconnectTimer.expires_from_now(boost::posix_time::seconds(m_iReconnectDelay));
++ m_ReconnectTimer.async_wait(
++ [this](const boost::system::error_code& error) {
++ cb_reconnect_start(error);
++ }
++ );
+ }
+ }
+
+ void ASyncTCP::cb_reconnect_start(const boost::system::error_code& error)
+ {
+- mIsReconnecting = false;
+- mReconnectTimer.cancel();
+- mTimeoutTimer.cancel();
++ m_bIsReconnecting = false;
++ m_ReconnectTimer.cancel();
++ m_TimeoutTimer.cancel();
+
+- if (mIsConnected) return;
++ if (m_bIsConnected) return;
+ if (error) return; // timer was cancelled
+
+ do_close();
+- connect(mIp, mPort);
++ connect(m_IP, m_Port);
+ }
+
+
+ void ASyncTCP::terminate(const bool silent)
+ {
+- mIsTerminating = true;
++ m_bIsTerminating = true;
+ disconnect(silent);
+- mTcpwork.reset();
+- mIos.stop();
+- if (mTcpthread)
++ m_Tcpwork.reset();
++ m_io_context.stop();
++ if (m_Tcpthread)
+ {
+- mTcpthread->join();
+- mTcpthread.reset();
++ m_Tcpthread->join();
++ m_Tcpthread.reset();
+ }
+- mIsReconnecting = false;
+- mIsConnected = false;
+- mWriteQ.clear();
+- mIsTerminating = false;
++ m_bIsReconnecting = false;
++ m_bIsConnected = false;
++ m_WriteQ.clear();
++ m_bIsTerminating = false;
+ }
+
+ void ASyncTCP::disconnect(const bool silent)
+ {
+- mReconnectTimer.cancel();
+- mTimeoutTimer.cancel();
+- if (!mTcpthread) return;
++ m_ReconnectTimer.cancel();
++ m_TimeoutTimer.cancel();
++ if (!m_Tcpthread) return;
+
+ try
+ {
+- mIos.post([this] { do_close(); });
++ boost::asio::post(m_io_context,
++ [this] {
++ do_close();
++ }
++ );
+ }
+ catch (...)
+ {
+@@ -223,62 +251,68 @@ void ASyncTCP::disconnect(const bool silent)
+
+ void ASyncTCP::do_close()
+ {
+- if (mIsReconnecting) {
++ if (m_bIsReconnecting) {
+ return;
+ }
+- mReconnectTimer.cancel();
+- mTimeoutTimer.cancel();
++ m_ReconnectTimer.cancel();
++ m_TimeoutTimer.cancel();
+ boost::system::error_code ec;
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
++ if (m_bSecure)
+ {
+- if (mSslSocket->lowest_layer().is_open())
++ if (m_SslSocket->lowest_layer().is_open())
+ {
+- mSslSocket->lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
+- mSslSocket->lowest_layer().close(ec);
++ m_SslSocket->lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
++ m_SslSocket->lowest_layer().close(ec);
+ }
+ }
+ else
+ #endif
+ {
+- if (mSocket.is_open())
++ if (m_Socket.is_open())
+ {
+- mSocket.close(ec);
++ m_Socket.close(ec);
+ }
+ }
+ }
+
+ void ASyncTCP::do_read_start()
+ {
+- if (mIsTerminating) return;
+- if (!mIsConnected) return;
++ if (m_bIsTerminating) return;
++ if (!m_bIsConnected) return;
+
+ timeout_start_timer();
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
++ if (m_bSecure)
+ {
+- mSslSocket->async_read_some(boost::asio::buffer(m_pRXBuffer, MAX_TCP_BUFFER_SIZE), [this](auto &&err, auto bytes) { cb_read_done(err, bytes); });
++ m_SslSocket->async_read_some(boost::asio::buffer(m_pRXBuffer, MAX_TCP_BUFFER_SIZE),
++ [this](const boost::system::error_code& error, size_t bytes_transferred) {
++ cb_read_done(error, bytes_transferred);
++ }
++ );
+ }
+ else
+ #endif
+ {
+- mSocket.async_read_some(boost::asio::buffer(m_pRXBuffer, MAX_TCP_BUFFER_SIZE), [this](auto &&err, auto bytes) { cb_read_done(err, bytes); });
++ m_Socket.async_read_some(boost::asio::buffer(m_pRXBuffer, MAX_TCP_BUFFER_SIZE),
++ [this](const boost::system::error_code& error, size_t bytes_transferred) {
++ cb_read_done(error, bytes_transferred);
++ }
++ );
+ }
+ }
+
+ void ASyncTCP::cb_read_done(const boost::system::error_code& error, size_t bytes_transferred)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
+- {
+- OnData(m_pRXBuffer, bytes_transferred);
+- do_read_start();
+- }
+- else
++ if (STATUS_ERR(error))
+ {
+ process_error(error);
++ return;
+ }
++ OnData(m_pRXBuffer, bytes_transferred);
++ do_read_start();
+ }
+
+ void ASyncTCP::write(const uint8_t* pData, size_t length)
+@@ -288,77 +322,66 @@ void ASyncTCP::write(const uint8_t* pData, size_t length)
+
+ void ASyncTCP::write(const std::string& msg)
+ {
+- if (!mTcpthread) return;
++ if (!m_Tcpthread) return;
+
+- mSendStrand.post([this, msg]() { cb_write_queue(msg); });
++ boost::asio::post(m_SendStrand, [this, msg]() { cb_write_queue(msg); });
+ }
+
+ void ASyncTCP::cb_write_queue(const std::string& msg)
+ {
+- mWriteQ.push_back(msg);
++ m_WriteQ.push_back(msg);
+
+- if (mWriteQ.size() == 1)
++ if (m_WriteQ.size() == 1)
+ do_write_start();
+ }
+
+ void ASyncTCP::do_write_start()
+ {
+- if (mIsTerminating) return;
+- if (!mIsConnected) return;
+- if (mWriteQ.empty())
++ if (m_bIsTerminating) return;
++ if (!m_bIsConnected) return;
++ if (m_WriteQ.empty())
+ return;
+
+ timeout_start_timer();
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
++ if (m_bSecure)
+ {
+- boost::asio::async_write(*mSslSocket, boost::asio::buffer(mWriteQ.front()), [this](auto &&err, auto) { cb_write_done(err); });
++ boost::asio::async_write(*m_SslSocket, boost::asio::buffer(m_WriteQ.front()),
++ [this](const boost::system::error_code& error, std::size_t length) {
++ cb_write_done(error, length);
++ }
++ );
+ }
+ else
+ #endif
+ {
+- boost::asio::async_write(mSocket, boost::asio::buffer(mWriteQ.front()), [this](auto &&err, auto) { cb_write_done(err); });
++ boost::asio::async_write(m_Socket, boost::asio::buffer(m_WriteQ.front()),
++ [this](const boost::system::error_code& error, std::size_t length) {
++ cb_write_done(error, length);
++ }
++ );
+ }
+ }
+
+-void ASyncTCP::cb_write_done(const boost::system::error_code& error)
++void ASyncTCP::cb_write_done(const boost::system::error_code& error, std::size_t /*length*/)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
+- {
+- mWriteQ.pop_front();
+- do_write_start();
+- }
+- else
++ if (STATUS_ERR(error))
+ {
+ process_error(error);
++ return;
+ }
+-}
+-
+-void ASyncTCP::process_connection()
+-{
+- mIsConnected = true;
+-#ifdef WWW_ENABLE_SSL
+-
+- if (!mSecure)
+-#endif
+- {
+- // RK: only if non-secure
+- boost::asio::socket_base::keep_alive option(true);
+- mSocket.set_option(option);
+- }
+- OnConnect();
+- do_read_start();
++ m_WriteQ.pop_front();
+ do_write_start();
+ }
+
+ void ASyncTCP::process_error(const boost::system::error_code& error)
+ {
+ do_close();
+- if (mIsConnected)
++ if (m_bIsConnected)
+ {
+- mIsConnected = false;
++ m_bIsConnected = false;
+ OnDisconnect();
+ }
+
+@@ -369,20 +392,23 @@ void ASyncTCP::process_error(const boost::system::error_code& error)
+ reconnect_start_timer();
+ }
+
+-/* timeout methods */
+ void ASyncTCP::timeout_start_timer()
+ {
+- if (0 == mTimeoutDelay) {
++ if (0 == m_iTimeoutDelay) {
+ return;
+ }
+ timeout_cancel_timer();
+- mTimeoutTimer.expires_from_now(boost::posix_time::seconds(mTimeoutDelay));
+- mTimeoutTimer.async_wait([this](auto &&err) { timeout_handler(err); });
++ m_TimeoutTimer.expires_from_now(boost::posix_time::seconds(m_iTimeoutDelay));
++ m_TimeoutTimer.async_wait(
++ [this](const boost::system::error_code& error) {
++ timeout_handler(error);
++ }
++ );
+ }
+
+ void ASyncTCP::timeout_cancel_timer()
+ {
+- mTimeoutTimer.cancel();
++ m_TimeoutTimer.cancel();
+ }
+
+ void ASyncTCP::timeout_handler(const boost::system::error_code& error)
+@@ -397,5 +423,5 @@ void ASyncTCP::timeout_handler(const boost::system::error_code& error)
+
+ void ASyncTCP::SetTimeout(const uint32_t Timeout)
+ {
+- mTimeoutDelay = Timeout;
++ m_iTimeoutDelay = Timeout;
+ }
+diff --git hardware/ASyncTCP.h hardware/ASyncTCP.h
+index cf859bb..a8b3ae2 100644
+--- hardware/ASyncTCP.h
++++ hardware/ASyncTCP.h
+@@ -3,39 +3,31 @@
+ #include <stddef.h> // for size_t
+ #include <deque> // for write queue
+ #include <boost/asio/deadline_timer.hpp> // for deadline_timer
+-#include <boost/asio/io_service.hpp> // for io_service
++#include <boost/asio/io_context.hpp> // for io_context
+ #include <boost/asio/strand.hpp> // for strand
+ #include <boost/asio/ip/tcp.hpp> // for tcp, tcp::endpoint, tcp::s...
+ #include <boost/asio/ssl.hpp> // for secure sockets
+ #include <boost/asio/ssl/stream.hpp> // for secure sockets
+ #include <exception> // for exception
++#include <optional> // for optional
+
+ #define ASYNCTCP_THREAD_NAME "ASyncTCP"
+ #define DEFAULT_RECONNECT_TIME 30
+ #define DEFAULT_TIMEOUT_TIME 60
+
+-namespace boost
+-{
+- namespace system
+- {
+- class error_code;
+- } // namespace system
+-} // namespace boost
+-
+ class ASyncTCP
+ {
+- protected:
++protected:
+ ASyncTCP(bool secure = false);
+ virtual ~ASyncTCP();
+-
+- void connect(const std::string &hostname, uint16_t port);
++ void connect(const std::string& hostname, uint16_t port);
+ void disconnect(bool silent = true);
+- void write(const std::string &msg);
+- void write(const uint8_t *pData, size_t length);
+- void SetReconnectDelay(int32_t Delay = DEFAULT_RECONNECT_TIME);
++ void write(const std::string& msg);
++ void write(const uint8_t* pData, size_t length);
++ void SetReconnectDelay(const int32_t Delay = DEFAULT_RECONNECT_TIME);
+ bool isConnected()
+ {
+- return mIsConnected;
++ return m_bIsConnected;
+ };
+ void terminate(bool silent = true);
+ void SetTimeout(uint32_t Timeout = DEFAULT_TIMEOUT_TIME);
+@@ -43,65 +35,61 @@ class ASyncTCP
+ // Callback interface to implement in derived classes
+ virtual void OnConnect() = 0;
+ virtual void OnDisconnect() = 0;
+- virtual void OnData(const uint8_t *pData, size_t length) = 0;
+- virtual void OnError(const boost::system::error_code &error) = 0;
+-
+- boost::asio::io_service mIos; // protected to allow derived classes to attach timers etc.
++ virtual void OnData(const uint8_t* pData, size_t length) = 0;
++ virtual void OnError(const boost::system::error_code& error) = 0;
+
+- private:
+- void cb_resolve_done(const boost::system::error_code &err, boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
+- void connect_start(boost::asio::ip::tcp::resolver::iterator &endpoint_iterator);
+- void cb_connect_done(const boost::system::error_code &error, boost::asio::ip::tcp::resolver::iterator &endpoint_iterator);
++ boost::asio::io_context m_io_context; // protected to allow derived classes to attach timers etc.
++private:
++ void handle_resolve(const boost::system::error_code& ec, const boost::asio::ip::tcp::resolver::results_type &results);
++ void handle_connect(const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& endpoint);
+ #ifdef WWW_ENABLE_SSL
+- void cb_handshake_done(const boost::system::error_code &error);
++ void cb_handshake_done(const boost::system::error_code& error);
+ #endif
+
+- /* timeout methods */
+ void timeout_start_timer();
+ void timeout_cancel_timer();
+ void reconnect_start_timer();
+- void timeout_handler(const boost::system::error_code &error);
++ void timeout_handler(const boost::system::error_code& error);
+
+- void cb_reconnect_start(const boost::system::error_code &error);
++ void cb_reconnect_start(const boost::system::error_code& error);
+
+ void do_close();
+
+ void do_read_start();
+- void cb_read_done(const boost::system::error_code &error, size_t bytes_transferred);
++ void cb_read_done(const boost::system::error_code& error, size_t bytes_transferred);
+
+- void cb_write_queue(const std::string &msg);
++ void cb_write_queue(const std::string& msg);
+ void do_write_start();
+- void cb_write_done(const boost::system::error_code &error);
++ void cb_write_done(const boost::system::error_code& error, size_t length);
+
+ void process_connection();
+- void process_error(const boost::system::error_code &error);
++ void process_error(const boost::system::error_code& error);
+
+- bool mIsConnected = false;
+- bool mIsReconnecting = false;
+- bool mIsTerminating = false;
++ bool m_bIsConnected = false;
++ bool m_bIsReconnecting = false;
++ bool m_bIsTerminating = false;
+
+- boost::asio::io_service::strand mSendStrand{ mIos };
+- std::deque<std::string> mWriteQ; // we need a write queue to allow concurrent writes
++ boost::asio::io_context::strand m_SendStrand;
++ std::deque<std::string> m_WriteQ; // we need a write queue to allow concurrent writes
+
+ uint8_t* m_pRXBuffer = nullptr;
+
+- int mReconnectDelay = DEFAULT_RECONNECT_TIME;
+- int mTimeoutDelay = 0;
+- boost::asio::deadline_timer mReconnectTimer{ mIos };
+- boost::asio::deadline_timer mTimeoutTimer{ mIos };
++ int m_iReconnectDelay = DEFAULT_RECONNECT_TIME;
++ int m_iTimeoutDelay = 0;
++ boost::asio::deadline_timer m_ReconnectTimer;
++ boost::asio::deadline_timer m_TimeoutTimer;
+
+- std::shared_ptr<std::thread> mTcpthread;
+- std::shared_ptr<boost::asio::io_service::work> mTcpwork;
++ std::shared_ptr<std::thread> m_Tcpthread;
++ std::optional<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>> m_Tcpwork;
+
+ #ifdef WWW_ENABLE_SSL
+- const bool mSecure;
++ const bool m_bSecure;
+ boost::asio::ssl::context mContext{ boost::asio::ssl::context::sslv23 };
+- std::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>> mSslSocket; // the ssl socket
++ std::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>> m_SslSocket;
+ #endif
+- boost::asio::ip::tcp::socket mSocket{ mIos };
+- boost::asio::ip::tcp::endpoint mEndPoint;
+- boost::asio::ip::tcp::resolver mResolver{ mIos };
++ boost::asio::ip::tcp::socket m_Socket;
++ boost::asio::ip::tcp::resolver m_Resolver;
+
+- std::string mIp;
+- uint16_t mPort;
++ std::string m_IP;
++ uint16_t m_Port;
+ };
+diff --git hardware/Arilux.cpp hardware/Arilux.cpp
+index 400f5a3..20bc373 100644
+--- hardware/Arilux.cpp
++++ hardware/Arilux.cpp
+@@ -79,7 +79,7 @@ void Arilux::InsertUpdateSwitch(const std::string &lightName, const int subType,
+ {
+ uint32_t sID;
+ try {
+- sID = boost::asio::ip::address_v4::from_string(location).to_ulong();
++ sID = boost::asio::ip::make_address_v4(location).to_uint();
+ } catch (const std::exception &e) {
+ Log(LOG_ERROR, "Bad IP address: %s (%s)", location.c_str(), e.what());
+ return;
+@@ -112,8 +112,8 @@ bool Arilux::SendTCPCommand(uint32_t ip,std::vector<unsigned char> &command)
+ sum = sum & 0xFF;
+ command.push_back((unsigned char)sum);
+
+- boost::asio::io_service io_service;
+- boost::asio::ip::tcp::socket sendSocket(io_service);
++ boost::asio::io_context io_context;
++ boost::asio::ip::tcp::socket sendSocket(io_context);
+ boost::asio::ip::address_v4 address(ip);
+ boost::asio::ip::tcp::endpoint endpoint(address, 5577);
+ try
+diff --git hardware/Kodi.cpp hardware/Kodi.cpp
+index b528017..5ababf6 100644
+--- hardware/Kodi.cpp
++++ hardware/Kodi.cpp
+@@ -143,14 +143,14 @@ _eNotificationTypes CKodiNode::CKodiStatus::NotificationType()
+ }
+ }
+
+-CKodiNode::CKodiNode(boost::asio::io_service *pIos, const int pHwdID, const int PollIntervalsec, const int pTimeoutMs,
++CKodiNode::CKodiNode(boost::asio::io_context *pIoc, const int pHwdID, const int PollIntervalsec, const int pTimeoutMs,
+ const std::string& pID, const std::string& pName, const std::string& pIP, const std::string& pPort)
+ {
+ m_Busy = false;
+ m_Stoppable = false;
+ m_PlaylistPosition = 0;
+
+- m_Ios = pIos;
++ m_Ioc = pIoc;
+ m_HwdID = pHwdID;
+ m_DevID = atoi(pID.c_str());
+ sprintf(m_szDevID, "%X%02X%02X%02X", 0, 0, (m_DevID & 0xFF00) >> 8, m_DevID & 0xFF);
+@@ -581,11 +581,10 @@ void CKodiNode::handleConnect()
+ {
+ m_iMissedPongs = 0;
+ boost::system::error_code ec;
+- boost::asio::ip::tcp::resolver resolver(*m_Ios);
+- boost::asio::ip::tcp::resolver::query query(m_IP, (m_Port[0] != '-' ? m_Port : m_Port.substr(1)));
+- auto iter = resolver.resolve(query);
+- boost::asio::ip::tcp::endpoint endpoint = *iter;
+- m_Socket = new boost::asio::ip::tcp::socket(*m_Ios);
++ boost::asio::ip::tcp::resolver resolver(*m_Ioc);
++ auto iter = resolver.resolve(m_IP, (m_Port[0] != '-' ? m_Port : m_Port.substr(1)));
++ boost::asio::ip::tcp::endpoint endpoint = *iter.begin();
++ m_Socket = new boost::asio::ip::tcp::socket(*m_Ioc);
+ m_Socket->connect(endpoint, ec);
+ if (!ec)
+ {
+@@ -975,19 +974,19 @@ void CKodi::Do_Work()
+ _log.Log(LOG_NORM, "Kodi: (%s) - Restarting thread.", node->m_Name.c_str());
+ boost::thread *tAsync = new boost::thread(&CKodiNode::Do_Work, node);
+ SetThreadName(tAsync->native_handle(), "KodiNode");
+- m_ios.stop();
++ m_ioc.stop();
+ }
+ if (node->IsOn())
+ bWorkToDo = true;
+ }
+
+- if (bWorkToDo && m_ios.stopped()) // make sure that there is a boost thread to service i/o operations
++ if (bWorkToDo && m_ioc.stopped()) // make sure that there is a boost thread to service i/o operations
+ {
+- m_ios.reset();
++ m_ioc.restart();
+ // Note that this is the only thread that handles async i/o so we don't
+ // need to worry about locking or concurrency issues when processing messages
+ _log.Log(LOG_NORM, "Kodi: Restarting I/O service thread.");
+- boost::thread bt([p = &m_ios] { p->run(); });
++ boost::thread bt([p = &m_ioc] { p->run(); });
+ SetThreadName(bt.native_handle(), "KodiIO");
+ }
+ }
+@@ -1138,7 +1137,7 @@ void CKodi::ReloadNodes()
+ {
+ UnloadNodes();
+
+- m_ios.reset(); // in case this is not the first time in
++ m_ioc.restart(); // in case this is not the first time in
+
+ std::vector<std::vector<std::string> > result;
+ result = m_sql.safe_query("SELECT ID,Name,MacAddress,Timeout FROM WOLNodes WHERE (HardwareID==%d)", m_HwdID);
+@@ -1149,7 +1148,7 @@ void CKodi::ReloadNodes()
+ // create a vector to hold the nodes
+ for (const auto &sd : result)
+ {
+- auto pNode = std::make_shared<CKodiNode>(&m_ios, m_HwdID, m_iPollInterval, m_iPingTimeoutms, sd[0], sd[1], sd[2], sd[3]);
++ auto pNode = std::make_shared<CKodiNode>(&m_ioc, m_HwdID, m_iPollInterval, m_iPingTimeoutms, sd[0], sd[1], sd[2], sd[3]);
+ m_pNodes.push_back(pNode);
+ }
+ // start the threads to control each kodi
+@@ -1161,7 +1160,7 @@ void CKodi::ReloadNodes()
+ }
+ sleep_milliseconds(100);
+ _log.Log(LOG_NORM, "Kodi: Starting I/O service thread.");
+- boost::thread bt([p = &m_ios] { p->run(); });
++ boost::thread bt([p = &m_ioc] { p->run(); });
+ SetThreadName(bt.native_handle(), "KodiIO");
+ }
+ }
+@@ -1170,10 +1169,10 @@ void CKodi::UnloadNodes()
+ {
+ std::lock_guard<std::mutex> l(m_mutex);
+
+- m_ios.stop(); // stop the service if it is running
++ m_ioc.stop(); // stop the service if it is running
+ sleep_milliseconds(100);
+
+- while (((!m_pNodes.empty()) || (!m_ios.stopped())))
++ while (((!m_pNodes.empty()) || (!m_ioc.stopped())))
+ {
+ for (auto itt = m_pNodes.begin(); itt != m_pNodes.end(); ++itt)
+ {
+diff --git hardware/Kodi.h hardware/Kodi.h
+index 14f331c..4435740 100644
+--- hardware/Kodi.h
++++ hardware/Kodi.h
+@@ -150,7 +150,7 @@ class CKodiNode : public std::enable_shared_from_this<CKodiNode>, StoppableTask
+ };
+
+ public:
+- CKodiNode(boost::asio::io_service *, int, int, int, const std::string &, const std::string &, const std::string &, const std::string &);
++ CKodiNode(boost::asio::io_context *, int, int, int, const std::string &, const std::string &, const std::string &, const std::string &);
+ ~CKodiNode();
+ void Do_Work();
+ void SendCommand(const std::string &);
+@@ -207,7 +207,7 @@ class CKodiNode : public std::enable_shared_from_this<CKodiNode>, StoppableTask
+ int m_iPollIntSec;
+ int m_iMissedPongs;
+ std::string m_sLastMessage;
+- boost::asio::io_service *m_Ios;
++ boost::asio::io_context *m_Ioc;
+ boost::asio::ip::tcp::socket *m_Socket;
+ std::array<char, 256> m_Buffer;
+ };
+@@ -243,5 +243,5 @@ class CKodi : public CDomoticzHardwareBase
+ int m_iPingTimeoutms;
+ std::shared_ptr<std::thread> m_thread;
+ std::mutex m_mutex;
+- boost::asio::io_service m_ios;
++ boost::asio::io_context m_ioc;
+ };
+diff --git hardware/MQTTAutoDiscover.h hardware/MQTTAutoDiscover.h
+index 0832664..1501d6f 100644
+--- hardware/MQTTAutoDiscover.h
++++ hardware/MQTTAutoDiscover.h
+@@ -176,7 +176,7 @@ public:
+ void on_message(const struct mosquitto_message *message) override;
+ void on_connect(int rc) override;
+ void on_disconnect(int rc) override;
+- void on_going_down();
++ void on_going_down() override;
+ private:
+ void InsertUpdateSwitch(_tMQTTASensor* pSensor);
+
+diff --git hardware/PanasonicTV.cpp hardware/PanasonicTV.cpp
+index fc57d34..ce20565 100644
+--- hardware/PanasonicTV.cpp
++++ hardware/PanasonicTV.cpp
+@@ -356,18 +356,17 @@ std::string CPanasonicNode::handleWriteAndRead(const std::string& pMessageToSend
+ {
+
+ _log.Debug(DEBUG_HARDWARE, "Panasonic Plugin: (%s) Handling message: '%s'.", m_Name.c_str(), pMessageToSend.c_str());
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_context;
+ // Get a list of endpoints corresponding to the server name.
+- boost::asio::ip::tcp::resolver resolver(io_service);
+- boost::asio::ip::tcp::resolver::query query(m_IP, (m_Port[0] != '-' ? m_Port : m_Port.substr(1)));
+- auto iter = resolver.resolve(query);
++ boost::asio::ip::tcp::resolver resolver(io_context);
++ auto endpoints = resolver.resolve(m_IP, (m_Port[0] != '-' ? m_Port : m_Port.substr(1)));
++ auto iter = endpoints.begin();
+ boost::asio::ip::tcp::endpoint endpoint = *iter;
+- boost::asio::ip::tcp::resolver::iterator end;
+
+ // Try each endpoint until we successfully establish a connection.
+- boost::asio::ip::tcp::socket socket(io_service);
++ boost::asio::ip::tcp::socket socket(io_context);
+ boost::system::error_code error = boost::asio::error::host_not_found;
+- while (error && iter != end)
++ while (error && iter != endpoints.end())
+ {
+ socket.close();
+ if (handleConnect(socket, *iter, error))
+@@ -1060,7 +1059,7 @@ void CPanasonic::ReloadNodes()
+ {
+ UnloadNodes();
+
+- //m_ios.reset(); // in case this is not the first time in
++ //m_ioc.reset(); // in case this is not the first time in
+
+ std::vector<std::vector<std::string> > result;
+ result = m_sql.safe_query("SELECT ID,Name,MacAddress,Timeout FROM WOLNodes WHERE (HardwareID==%d)", m_HwdID);
+@@ -1088,10 +1087,10 @@ void CPanasonic::UnloadNodes()
+ {
+ std::lock_guard<std::mutex> l(m_mutex);
+
+- m_ios.stop(); // stop the service if it is running
++ m_ioc.stop(); // stop the service if it is running
+ sleep_milliseconds(100);
+
+- while (((!m_pNodes.empty()) || (!m_ios.stopped())))
++ while (((!m_pNodes.empty()) || (!m_ioc.stopped())))
+ {
+ for (auto itt = m_pNodes.begin(); itt != m_pNodes.end(); ++itt)
+ {
+diff --git hardware/PanasonicTV.h hardware/PanasonicTV.h
+index b0a94ff..30e1ca1 100644
+--- hardware/PanasonicTV.h
++++ hardware/PanasonicTV.h
+@@ -39,7 +39,7 @@ class CPanasonic : public CDomoticzHardwareBase
+ bool m_bTryIfOff;
+ std::shared_ptr<std::thread> m_thread;
+ std::mutex m_mutex;
+- boost::asio::io_service m_ios;
++ boost::asio::io_context m_ioc;
+
+ friend class CPanasonicNode;
+ };
+diff --git hardware/Pinger.cpp hardware/Pinger.cpp
+index a66c7a1..e070b29 100644
+--- hardware/Pinger.cpp
++++ hardware/Pinger.cpp
+@@ -21,23 +21,23 @@
+ #if BOOST_VERSION >= 107000
+ #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
+ #else
+-#define GET_IO_SERVICE(s) ((s).get_io_service())
++#define GET_IO_SERVICE(s) ((s).get_io_context())
+ #endif
+
+ class pinger
+ : private domoticz::noncopyable
+ {
+ public:
+- pinger(boost::asio::io_service &io_service, const char *destination, const int iPingTimeoutms)
++ pinger(boost::asio::io_context &io_context, const char *destination, const int iPingTimeoutms)
+ : num_replies_(0)
+ , m_PingState(false)
+- , resolver_(io_service)
+- , socket_(io_service, boost::asio::ip::icmp::v4())
+- , timer_(io_service)
++ , resolver_(io_context)
++ , socket_(io_context, boost::asio::ip::icmp::v4())
++ , timer_(io_context)
+ , sequence_number_(0)
+ {
+- boost::asio::ip::icmp::resolver::query query(boost::asio::ip::icmp::v4(), destination, "");
+- destination_ = *resolver_.resolve(query);
++ auto endpoints = resolver_.resolve(boost::asio::ip::icmp::v4(), destination, "");
++ destination_ = endpoints.begin()->endpoint();
+
+ num_tries_ = 1;
+ PingTimeoutms_ = iPingTimeoutms;
+@@ -332,11 +332,11 @@ void CPinger::ReloadNodes()
+ void CPinger::Do_Ping_Worker(const PingNode &Node)
+ {
+ bool bPingOK = false;
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_context;
+ try
+ {
+- pinger p(io_service, Node.IP.c_str(), m_iPingTimeoutms);
+- io_service.run();
++ pinger p(io_context, Node.IP.c_str(), m_iPingTimeoutms);
++ io_context.run();
+ if (p.m_PingState == true)
+ {
+ bPingOK = true;
+diff --git hardware/RFLinkMQTT.h hardware/RFLinkMQTT.h
+index e938328..72433b8 100644
+--- hardware/RFLinkMQTT.h
++++ hardware/RFLinkMQTT.h
+@@ -46,7 +46,7 @@ protected:
+ boost::signals2::connection m_sDeviceReceivedConnection;
+ boost::signals2::connection m_sSwitchSceneConnection;
+ void selectNextIPAdress( void );
+- virtual bool WriteInt(const std::string &sendString); // override;
++ bool WriteInt(const std::string &sendString) override;
+ void Do_Work();
+ virtual void SendHeartbeat();
+ void StopMQTT();
+diff --git hardware/TCPProxy/tcpproxy_server.cpp hardware/TCPProxy/tcpproxy_server.cpp
+index 8aceb0b..d77d4bf 100644
+--- hardware/TCPProxy/tcpproxy_server.cpp
++++ hardware/TCPProxy/tcpproxy_server.cpp
+@@ -18,12 +18,12 @@
+ #if BOOST_VERSION >= 107000
+ #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
+ #else
+-#define GET_IO_SERVICE(s) ((s).get_io_service())
++#define GET_IO_SERVICE(s) ((s).get_io_context())
+ #endif
+
+ namespace tcp_proxy
+ {
+- bridge::bridge(boost::asio::io_service& ios)
++ bridge::bridge(boost::asio::io_context& ios)
+ : downstream_socket_(ios),
+ upstream_socket_(ios)
+ {
+@@ -44,7 +44,7 @@ namespace tcp_proxy
+ boost::asio::ip::tcp::endpoint end;
+
+
+- boost::asio::io_service &ios= GET_IO_SERVICE(downstream_socket_);
++ boost::asio::io_context &ios= GET_IO_SERVICE(downstream_socket_);
+ boost::asio::ip::tcp::resolver resolver(ios);
+ boost::asio::ip::tcp::resolver::query query(upstream_host, upstream_port, boost::asio::ip::resolver_query_base::numeric_service);
+ auto i = resolver.resolve(query);
+@@ -137,10 +137,10 @@ namespace tcp_proxy
+ }
+ //Acceptor Class
+ acceptor::acceptor(const std::string &local_host, unsigned short local_port, const std::string &upstream_host, const std::string &upstream_port)
+- : io_service_()
++ : io_context_()
+ , m_bDoStop(false)
+ , localhost_address(boost::asio::ip::address_v4::from_string(local_host))
+- , acceptor_(io_service_, boost::asio::ip::tcp::endpoint(localhost_address, local_port))
++ , acceptor_(io_context_, boost::asio::ip::tcp::endpoint(localhost_address, local_port))
+ , upstream_host_(upstream_host)
+ , upstream_port_(upstream_port)
+ {
+@@ -151,7 +151,7 @@ namespace tcp_proxy
+ {
+ try
+ {
+- session_ = std::make_shared<bridge>(io_service_);
++ session_ = std::make_shared<bridge>(io_context_);
+ session_->sDownstreamData.connect([this](auto d, auto l) { OnDownstreamData(d, l); });
+ session_->sUpstreamData.connect([this](auto d, auto l) { OnUpstreamData(d, l); });
+
+@@ -169,11 +169,11 @@ namespace tcp_proxy
+ m_bDoStop=false;
+
+ accept_connections();
+- // The io_service::run() call will block until all asynchronous operations
++ // The io_context::run() call will block until all asynchronous operations
+ // have finished. While the server is running, there is always at least one
+ // asynchronous operation outstanding: the asynchronous accept call waiting
+ // for new incoming connections.
+- io_service_.run();
++ io_context_.run();
+ return true;
+ }
+ bool acceptor::stop()
+@@ -181,14 +181,14 @@ namespace tcp_proxy
+ m_bDoStop=true;
+ // Post a call to the stop function so that server::stop() is safe to call
+ // from any thread.
+- io_service_.post([this] { handle_stop(); });
++ io_context_.post([this] { handle_stop(); });
+ return true;
+ }
+
+ void acceptor::handle_stop()
+ {
+ // The server is stopped by canceling all outstanding asynchronous
+- // operations. Once all operations have finished the io_service::run() call
++ // operations. Once all operations have finished the io_context::run() call
+ // will exit.
+ acceptor_.close();
+ //connection_manager_.stop_all();
+diff --git hardware/TCPProxy/tcpproxy_server.h hardware/TCPProxy/tcpproxy_server.h
+index 3d1a150..148e65f 100644
+--- hardware/TCPProxy/tcpproxy_server.h
++++ hardware/TCPProxy/tcpproxy_server.h
+@@ -10,7 +10,7 @@ namespace tcp_proxy
+ class bridge : public std::enable_shared_from_this<bridge>
+ {
+ public:
+- explicit bridge(boost::asio::io_service& ios);
++ explicit bridge(boost::asio::io_context& ios);
+ boost::asio::ip::tcp::socket& downstream_socket();
+ boost::asio::ip::tcp::socket& upstream_socket();
+
+@@ -52,8 +52,8 @@ namespace tcp_proxy
+ void OnUpstreamData(const unsigned char *pData, size_t Len);
+ void OnDownstreamData(const unsigned char *pData, size_t Len);
+
+- /// The io_service used to perform asynchronous operations.
+- boost::asio::io_service io_service_;
++ /// The io_context used to perform asynchronous operations.
++ boost::asio::io_context io_context_;
+ bool m_bDoStop;
+ boost::asio::ip::address_v4 localhost_address;
+ boost::asio::ip::tcp::acceptor acceptor_;
+diff --git hardware/XiaomiDeviceSupport.h hardware/XiaomiDeviceSupport.h
+index fad7884..4a76d96 100644
+--- hardware/XiaomiDeviceSupport.h
++++ hardware/XiaomiDeviceSupport.h
+@@ -15,6 +15,7 @@
+ class XiaomiDeviceSupport
+ {
+ public:
++ virtual ~XiaomiDeviceSupport() = default;
+ /**
+ * Method to get 'model' corresponding to the ID of the device in case the Gateway API didn't provide it.
+ *
+diff --git hardware/XiaomiGateway.cpp hardware/XiaomiGateway.cpp
+index 66acdc5..fb4387a 100644
+--- hardware/XiaomiGateway.cpp
++++ hardware/XiaomiGateway.cpp
+@@ -538,12 +538,12 @@ bool XiaomiGateway::SendMessageToGateway(const std::string &controlmessage)
+ {
+ std::string message = controlmessage;
+ bool result = true;
+- boost::asio::io_service io_service;
+- boost::asio::ip::udp::socket socket_(io_service, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0));
++ boost::asio::io_context io_context;
++ boost::asio::ip::udp::socket socket_(io_context, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0));
+ stdreplace(message, "@gatewaykey", GetGatewayKey());
+ std::shared_ptr<std::string> message1(new std::string(message));
+ boost::asio::ip::udp::endpoint remote_endpoint_;
+- remote_endpoint_ = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(m_GatewayIp), 9898);
++ remote_endpoint_ = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4(m_GatewayIp), 9898);
+ socket_.send_to(boost::asio::buffer(*message1), remote_endpoint_);
+ sleep_milliseconds(150); // TODO: reduce or remove sleep
+ std::array<char, 512> recv_buffer_;
+@@ -1015,15 +1015,14 @@ bool XiaomiGateway::StopHardware()
+ void XiaomiGateway::Do_Work()
+ {
+ Log(LOG_STATUS, "XiaomiGateway (ID=%d): Worker started...", m_HwdID);
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_context;
+ // Find the local ip address that is similar to the xiaomi gateway
+ try
+ {
+- boost::asio::ip::udp::resolver resolver(io_service);
+- boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(), m_GatewayIp, "");
+- auto endpoints = resolver.resolve(query);
+- boost::asio::ip::udp::endpoint ep = *endpoints;
+- boost::asio::ip::udp::socket socket(io_service);
++ boost::asio::ip::udp::resolver resolver(io_context);
++ auto endpoints = resolver.resolve(boost::asio::ip::udp::v4(), m_GatewayIp, "");
++ boost::asio::ip::udp::endpoint ep = *endpoints.begin();
++ boost::asio::ip::udp::socket socket(io_context);
+ socket.connect(ep);
+ boost::asio::ip::address addr = socket.local_endpoint().address();
+ std::string compareIp = m_GatewayIp.substr(0, (m_GatewayIp.length() - 3));
+@@ -1073,11 +1072,11 @@ void XiaomiGateway::Do_Work()
+ }
+ }
+
+- XiaomiGateway::xiaomi_udp_server udp_server(io_service, m_HwdID, m_GatewayIp, m_LocalIp, m_ListenPort9898, m_OutputMessage, m_IncludeVoltage, this);
++ XiaomiGateway::xiaomi_udp_server udp_server(io_context, m_HwdID, m_GatewayIp, m_LocalIp, m_ListenPort9898, m_OutputMessage, m_IncludeVoltage, this);
+ boost::thread bt;
+ if (m_ListenPort9898)
+ {
+- bt = boost::thread([p = &io_service] { p->run(); });
++ bt = boost::thread([p = &io_context] { p->run(); });
+ SetThreadName(bt.native_handle(), "XiaomiGatewayIO");
+ }
+
+@@ -1094,7 +1093,7 @@ void XiaomiGateway::Do_Work()
+ // Log(LOG_STATUS, "sec_counter %d", sec_counter);
+ }
+ }
+- io_service.stop();
++ io_context.stop();
+ if (bt.joinable())
+ {
+ bt.join();
+@@ -1178,9 +1177,9 @@ unsigned int XiaomiGateway::GetShortID(const std::string &nodeid)
+ return sID;
+ }
+
+-XiaomiGateway::xiaomi_udp_server::xiaomi_udp_server(boost::asio::io_service &io_service, int m_HwdID, const std::string &gatewayIp, const std::string &localIp, const bool listenPort9898,
++XiaomiGateway::xiaomi_udp_server::xiaomi_udp_server(boost::asio::io_context &io_context, int m_HwdID, const std::string &gatewayIp, const std::string &localIp, const bool listenPort9898,
+ const bool outputMessage, const bool includeVoltage, XiaomiGateway *parent)
+- : socket_(io_service, boost::asio::ip::udp::v4())
++ : socket_(io_context, boost::asio::ip::udp::v4())
+ {
+ m_HardwareID = m_HwdID;
+ m_XiaomiGateway = parent;
+@@ -1196,8 +1195,8 @@ XiaomiGateway::xiaomi_udp_server::xiaomi_udp_server(boost::asio::io_service &io_
+ if (!m_localip.empty())
+ {
+ boost::system::error_code ec;
+- boost::asio::ip::address listen_addr = boost::asio::ip::address::from_string(m_localip, ec);
+- boost::asio::ip::address mcast_addr = boost::asio::ip::address::from_string("224.0.0.50", ec);
++ boost::asio::ip::address listen_addr = boost::asio::ip::make_address_v4(m_localip, ec);
++ boost::asio::ip::address mcast_addr = boost::asio::ip::make_address_v4("224.0.0.50", ec);
+ boost::asio::ip::udp::endpoint listen_endpoint(mcast_addr, 9898);
+
+ socket_.bind(boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 9898));
+@@ -1213,9 +1212,9 @@ XiaomiGateway::xiaomi_udp_server::xiaomi_udp_server(boost::asio::io_service &io_
+ socket_.bind(boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 9898));
+ std::shared_ptr<std::string> message(new std::string(R"({"cmd":"whois"})"));
+ boost::asio::ip::udp::endpoint remote_endpoint;
+- remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string("224.0.0.50"), 4321);
++ remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4("224.0.0.50"), 4321);
+ socket_.send_to(boost::asio::buffer(*message), remote_endpoint);
+- socket_.set_option(boost::asio::ip::multicast::join_group(boost::asio::ip::address::from_string("224.0.0.50")));
++ socket_.set_option(boost::asio::ip::multicast::join_group(boost::asio::ip::make_address_v4("224.0.0.50")));
+ }
+ }
+ catch (const boost::system::system_error &ex)
+@@ -1720,7 +1719,7 @@ void XiaomiGateway::xiaomi_udp_server::handle_receive(const boost::system::error
+ message.append("\"}");
+ std::shared_ptr<std::string> message1(new std::string(message));
+ boost::asio::ip::udp::endpoint remote_endpoint;
+- remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(TrueGateway->GetGatewayIp().c_str()), 9898);
++ remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4(TrueGateway->GetGatewayIp().c_str()), 9898);
+ socket_.send_to(boost::asio::buffer(*message1), remote_endpoint);
+ }
+ }
+@@ -1746,7 +1745,7 @@ void XiaomiGateway::xiaomi_udp_server::handle_receive(const boost::system::error
+ std::string message = R"({"cmd" : "get_id_list"})";
+ std::shared_ptr<std::string> message2(new std::string(message));
+ boost::asio::ip::udp::endpoint remote_endpoint;
+- remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(TrueGateway->GetGatewayIp().c_str()), 9898);
++ remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4(TrueGateway->GetGatewayIp().c_str()), 9898);
+ socket_.send_to(boost::asio::buffer(*message2), remote_endpoint);
+ }
+ }
+diff --git hardware/XiaomiGateway.h hardware/XiaomiGateway.h
+index dce4b34..1f552f3 100644
+--- hardware/XiaomiGateway.h
++++ hardware/XiaomiGateway.h
+@@ -100,7 +100,7 @@ class XiaomiGateway : public CDomoticzHardwareBase
+ class xiaomi_udp_server
+ {
+ public:
+- xiaomi_udp_server(boost::asio::io_service &io_service, int m_HwdID, const std::string &gatewayIp, const std::string &localIp, bool listenPort9898, bool outputMessage,
++ xiaomi_udp_server(boost::asio::io_context &io_context, int m_HwdID, const std::string &gatewayIp, const std::string &localIp, bool listenPort9898, bool outputMessage,
+ bool includeVolage, XiaomiGateway *parent);
+ ~xiaomi_udp_server() = default;
+
+diff --git hardware/Yeelight.cpp hardware/Yeelight.cpp
+index cdb7889..e5fe8fc 100644
+--- hardware/Yeelight.cpp
++++ hardware/Yeelight.cpp
+@@ -93,8 +93,8 @@ void Yeelight::Do_Work()
+
+ try
+ {
+- boost::asio::io_service io_service;
+- udp_server server(io_service, m_HwdID);
++ boost::asio::io_context io_context;
++ udp_server server(io_context, m_HwdID);
+ int sec_counter = YEELIGHT_POLL_INTERVAL - 5;
+ while (!IsStopRequested(1000))
+ {
+@@ -105,7 +105,7 @@ void Yeelight::Do_Work()
+ if (sec_counter % 60 == 0) //poll YeeLights every minute
+ {
+ server.start_send();
+- io_service.run();
++ io_context.run();
+ }
+ }
+ }
+@@ -227,12 +227,11 @@ bool Yeelight::WriteToHardware(const char *pdata, const unsigned char length)
+
+ try
+ {
+- boost::asio::io_service io_service;
+- boost::asio::ip::tcp::socket sendSocket(io_service);
+- boost::asio::ip::tcp::resolver resolver(io_service);
+- boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), szTmp, "55443");
+- auto iterator = resolver.resolve(query);
+- boost::asio::connect(sendSocket, iterator);
++ boost::asio::io_context io_context;
++ boost::asio::ip::tcp::socket sendSocket(io_context);
++ boost::asio::ip::tcp::resolver resolver(io_context);
++ auto endpoints = resolver.resolve(boost::asio::ip::tcp::v4(), szTmp, "55443");
++ boost::asio::connect(sendSocket, endpoints);
+
+ std::string message;
+ std::string message2;
+@@ -404,8 +403,8 @@ bool Yeelight::WriteToHardware(const char *pdata, const unsigned char length)
+ std::array<char, 1024> recv_buffer_;
+ int hardwareId;
+
+-Yeelight::udp_server::udp_server(boost::asio::io_service& io_service, int m_HwdID)
+- : socket_(io_service, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0))
++Yeelight::udp_server::udp_server(boost::asio::io_context& io_context, int m_HwdID)
++ : socket_(io_context, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0))
+ {
+ socket_.set_option(boost::asio::ip::udp::socket::reuse_address(true));
+ socket_.set_option(boost::asio::socket_base::broadcast(true));
+@@ -421,7 +420,7 @@ void Yeelight::udp_server::start_send()
+ //Log(LOG_STATUS, "start_send..................");
+ std::shared_ptr<std::string> message(
+ new std::string(testMessage));
+- remote_endpoint_ = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string("239.255.255.250"), 1982);
++ remote_endpoint_ = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4("239.255.255.250"), 1982);
+ socket_.send_to(boost::asio::buffer(*message), remote_endpoint_);
+ sleep_milliseconds(150);
+ start_receive();
+diff --git hardware/Yeelight.h hardware/Yeelight.h
+index fb03c28..3b7b4c3 100644
+--- hardware/Yeelight.h
++++ hardware/Yeelight.h
+@@ -25,7 +25,7 @@ class Yeelight : public CDomoticzHardwareBase
+ class udp_server
+ {
+ public:
+- udp_server(boost::asio::io_service &io_service, int m_HwdID);
++ udp_server(boost::asio::io_context &io_context, int m_HwdID);
+ boost::asio::ip::udp::socket socket_;
+ boost::asio::ip::udp::endpoint remote_endpoint_;
+ void start_send();
+diff --git hardware/plugins/PluginManager.cpp hardware/plugins/PluginManager.cpp
+index 2813112..423edbb 100644
+--- hardware/plugins/PluginManager.cpp
++++ hardware/plugins/PluginManager.cpp
+@@ -64,7 +64,7 @@ namespace Plugins {
+ // PyMODINIT_FUNC PyInit_DomoticzEvents(void);
+
+ std::mutex PluginMutex; // controls accessto the message queue and m_pPlugins map
+- boost::asio::io_service ios;
++ boost::asio::io_context ios;
+
+ std::map<int, CDomoticzHardwareBase*> CPluginSystem::m_pPlugins;
+ std::map<std::string, std::string> CPluginSystem::m_PluginXml;
+@@ -315,7 +315,7 @@ namespace Plugins {
+ // Create initial IO Service thread
+ ios.restart();
+ // Create some work to keep IO Service alive
+- auto work = boost::asio::io_service::work(ios);
++ auto work = boost::asio::make_work_guard(ios);
+ boost::thread_group BoostThreads;
+ for (int i = 0; i < 1; i++)
+ {
+diff --git hardware/plugins/PluginTransports.cpp hardware/plugins/PluginTransports.cpp
+index 52d14e7..f7ace0f 100644
+--- hardware/plugins/PluginTransports.cpp
++++ hardware/plugins/PluginTransports.cpp
+@@ -116,15 +116,14 @@ namespace Plugins {
+ m_bConnected = false;
+ m_Socket = new boost::asio::ip::tcp::socket(ios);
+
+- boost::system::error_code ec;
+- boost::asio::ip::tcp::resolver::query query(m_IP, m_Port);
+- auto iter = m_Resolver.resolve(query);
+- boost::asio::ip::tcp::endpoint endpoint = *iter;
+-
+ //
+ // Async resolve/connect based on http://www.boost.org/doc/libs/1_45_0/doc/html/boost_asio/example/http/client/async_client.cpp
+ //
+- m_Resolver.async_resolve(query, [this](auto &&err, auto end) { handleAsyncResolve(err, end); });
++ m_Resolver.async_resolve(m_IP, m_Port,
++ [this](auto &&err, auto endpoints) {
++ handleAsyncResolve(err, endpoints);
++ }
++ );
+ }
+ }
+ catch (std::exception& e)
+@@ -139,15 +138,14 @@ namespace Plugins {
+ return true;
+ }
+
+- void CPluginTransportTCP::handleAsyncResolve(const boost::system::error_code & err, boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
++ void CPluginTransportTCP::handleAsyncResolve(const boost::system::error_code & err, boost::asio::ip::tcp::resolver::results_type endpoints)
+ {
+ CPlugin* pPlugin = ((CConnection*)m_pConnection)->pPlugin;
+ AccessPython Guard(pPlugin, "CPluginTransportTCP::handleAsyncResolve");
+
+ if (!err)
+ {
+- boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
+- m_Socket->async_connect(endpoint, [this, endpoint_iterator](auto &&err) mutable { handleAsyncConnect(err, ++endpoint_iterator); });
++ boost::asio::async_connect(*m_Socket, endpoints, [this](auto &&err, const boost::asio::ip::tcp::endpoint &endpoint) mutable { handleAsyncConnect(err, endpoint); });
+ }
+ else
+ {
+@@ -169,7 +167,7 @@ namespace Plugins {
+ }
+ }
+
+- void CPluginTransportTCP::handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::resolver::iterator &endpoint_iterator)
++ void CPluginTransportTCP::handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::endpoint &endpoint)
+ {
+ CPlugin* pPlugin = ((CConnection*)m_pConnection)->pPlugin;
+ AccessPython Guard(pPlugin, "CPluginTransportTCP::handleAsyncResolve");
+@@ -481,7 +479,7 @@ namespace Plugins {
+ }
+ };
+
+- void CPluginTransportTCPSecure::handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::resolver::iterator &endpoint_iterator)
++ void CPluginTransportTCPSecure::handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::endpoint &endpoint)
+ {
+ CPlugin* pPlugin = ((CConnection*)m_pConnection)->pPlugin;
+ if (!pPlugin) return;
+@@ -498,7 +496,7 @@ namespace Plugins {
+ SSL_set_tlsext_host_name(m_TLSSock->native_handle(), m_IP.c_str()); // Enable SNI
+
+ m_TLSSock->set_verify_mode(boost::asio::ssl::verify_none);
+- m_TLSSock->set_verify_callback(boost::asio::ssl::rfc2818_verification(m_IP));
++ m_TLSSock->set_verify_callback(boost::asio::ssl::host_name_verification(m_IP));
+ // m_TLSSock->set_verify_callback([this](auto v, auto &c){ VerifyCertificate(v, c);});
+ try
+ {
+@@ -648,7 +646,7 @@ namespace Plugins {
+ // Hanlde multicast
+ if (((m_IP.substr(0, 4) >= "224.") && (m_IP.substr(0, 4) <= "239.")) || (m_IP.substr(0, 4) == "255."))
+ {
+- m_Socket->set_option(boost::asio::ip::multicast::join_group(boost::asio::ip::address::from_string(m_IP.c_str())), ec);
++ m_Socket->set_option(boost::asio::ip::multicast::join_group(boost::asio::ip::make_address_v4(m_IP.c_str())), ec);
+ m_Socket->set_option(boost::asio::ip::multicast::hops(2), ec);
+ }
+ }
+@@ -764,7 +762,7 @@ namespace Plugins {
+ }
+ else
+ {
+- boost::asio::ip::udp::endpoint destination(boost::asio::ip::address::from_string(m_IP.c_str()), atoi(m_Port.c_str()));
++ boost::asio::ip::udp::endpoint destination(boost::asio::ip::make_address_v4(m_IP.c_str()), atoi(m_Port.c_str()));
+ size_t bytes_transferred = m_Socket->send_to(boost::asio::buffer(pMessage, pMessage.size()), destination);
+ }
+ }
+@@ -825,12 +823,14 @@ namespace Plugins {
+ }
+ };
+
+- void CPluginTransportICMP::handleAsyncResolve(const boost::system::error_code &ec, const boost::asio::ip::icmp::resolver::iterator &endpoint_iterator)
++ void CPluginTransportICMP::handleAsyncResolve(const boost::system::error_code &ec, boost::asio::ip::icmp::resolver::results_type endpoints)
+ {
+ if (!ec)
+ {
++ m_Endpoint = endpoints.begin()->endpoint();
++ m_IP = m_Endpoint.address().to_string();
++
+ m_bConnected = true;
+- m_IP = endpoint_iterator->endpoint().address().to_string();
+
+ // Listen will fail (10022 - bad parameter) unless something has been sent(?)
+ std::string body("ping");
+@@ -857,15 +857,11 @@ namespace Plugins {
+ m_bConnecting = true;
+ m_Socket = new boost::asio::ip::icmp::socket(ios, boost::asio::ip::icmp::v4());
+
+- boost::system::error_code ec;
+- boost::asio::ip::icmp::resolver::query query(boost::asio::ip::icmp::v4(), m_IP, "");
+- auto iter = m_Resolver.resolve(query);
+- m_Endpoint = *iter;
+-
+- //
+- // Async resolve/connect based on http://www.boost.org/doc/libs/1_51_0/doc/html/boost_asio/example/icmp/ping.cpp
+- //
+- m_Resolver.async_resolve(query, [this](auto &&err, auto i) { handleAsyncResolve(err, i); });
++ m_Resolver.async_resolve(boost::asio::ip::icmp::v4(), m_IP, "",
++ [this](auto &&err, auto endpoints) {
++ handleAsyncResolve(err, endpoints);
++ }
++ );
+ }
+ else
+ {
+diff --git hardware/plugins/PluginTransports.h hardware/plugins/PluginTransports.h
+index c1cc1e3..79d5725 100644
+--- hardware/plugins/PluginTransports.h
++++ hardware/plugins/PluginTransports.h
+@@ -6,7 +6,7 @@
+
+ namespace Plugins {
+
+- extern boost::asio::io_service ios;
++ extern boost::asio::io_context ios;
+
+ class CPluginTransport
+ {
+@@ -85,8 +85,8 @@ namespace Plugins {
+ , m_Socket(nullptr){};
+ bool handleConnect() override;
+ bool handleListen() override;
+- virtual void handleAsyncResolve(const boost::system::error_code &err, boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
+- virtual void handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::resolver::iterator &endpoint_iterator);
++ virtual void handleAsyncResolve(const boost::system::error_code &err, boost::asio::ip::tcp::resolver::results_type endpoints);
++ virtual void handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::endpoint &endpoint);
+ virtual void handleAsyncAccept(boost::asio::ip::tcp::socket *pSocket, const boost::system::error_code &error);
+ void handleRead(const boost::system::error_code &e, std::size_t bytes_transferred) override;
+ void handleWrite(const std::vector<byte> &pMessage) override;
+@@ -111,7 +111,7 @@ namespace Plugins {
+ : CPluginTransportTCP(HwdID, pConnection, Address, Port)
+ , m_Context(nullptr)
+ , m_TLSSock(nullptr){};
+- void handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::resolver::iterator &endpoint_iterator) override;
++ void handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::endpoint &endpoint) override;
+ void handleRead(const boost::system::error_code &e, std::size_t bytes_transferred) override;
+ void handleWrite(const std::vector<byte> &pMessage) override;
+ ~CPluginTransportTCPSecure() override;
+@@ -151,7 +151,7 @@ namespace Plugins {
+ , m_Socket(nullptr)
+ , m_Timer(nullptr)
+ , m_SequenceNo(-1){};
+- void handleAsyncResolve(const boost::system::error_code &err, const boost::asio::ip::icmp::resolver::iterator &endpoint_iterator);
++ void handleAsyncResolve(const boost::system::error_code &err, boost::asio::ip::icmp::resolver::results_type endpoints);
+ bool handleListen() override;
+ void handleTimeout(const boost::system::error_code &) override;
+ void handleRead(const boost::system::error_code &e, std::size_t bytes_transferred) override;
+diff --git main/WebServerCmds.cpp main/WebServerCmds.cpp
+index 7d4a9f2..3586373 100644
+--- main/WebServerCmds.cpp
++++ main/WebServerCmds.cpp
+@@ -1632,7 +1632,7 @@ namespace http
+ ExtraHeaders.push_back("App_Revision: " + std::to_string(iAppRevision));
+ ExtraHeaders.push_back("System_Name: " + systemname);
+ ExtraHeaders.push_back("Machine: " + machine);
+- ExtraHeaders.push_back("Type: " + (!bIsBetaChannel) ? "Stable" : "Beta");
++ ExtraHeaders.push_back("Type: " + std::string(!bIsBetaChannel ? "Stable" : "Beta"));
+
+ if (!HTTPClient::GET(szHistoryURL, ExtraHeaders, historyfile))
+ {
+diff --git main/mainworker.cpp main/mainworker.cpp
+index b5027eb..b8f8dc7 100644
+--- main/mainworker.cpp
++++ main/mainworker.cpp
+@@ -1318,7 +1318,7 @@ bool MainWorker::IsUpdateAvailable(const bool bIsForced)
+ ExtraHeaders.push_back("App_Revision: " + std::to_string(iAppRevision));
+ ExtraHeaders.push_back("System_Name: " + m_szSystemName);
+ ExtraHeaders.push_back("Machine: " + machine);
+- ExtraHeaders.push_back("Type: " + (!bIsBetaChannel) ? "Stable" : "Beta");
++ ExtraHeaders.push_back("Type: " + std::string(!bIsBetaChannel ? "Stable" : "Beta"));
+
+ if (!HTTPClient::GET(szURL, ExtraHeaders, revfile))
+ return false;
+diff --git plugins/examples/Pinger.py plugins/examples/Pinger.py
+index 6b54559..c7a776d 100644
+--- plugins/examples/Pinger.py
++++ plugins/examples/Pinger.py
+@@ -3,7 +3,7 @@
+ # Author: Dnpwwo, 2017 - 2018
+ #
+ """
+-<plugin key="ICMP" name="Pinger (ICMP)" author="dnpwwo" version="3.1.4">
++<plugin key="ICMP" name="Pinger (ICMP)" author="dnpwwo" version="3.1.5">
+ <description>
+ ICMP Pinger Plugin.<br/><br/>
+ Specify comma delimted addresses (IP or DNS names) of devices that are to be pinged.<br/>
+@@ -144,8 +144,9 @@ class BasePlugin:
+ for Device in Devices:
+ if (("Name" in Devices[Device].Options) and (Devices[Device].Options["Name"] == Connection.Name)):
+ UpdateDevice(Device, 0, "Off", TimedOut)
+- self.icmpConn.Close()
+- self.icmpConn = None
++ if (self.icmpConn != None):
++ self.icmpConn.Close()
++ self.icmpConn = None
+
+ def onHeartbeat(self):
+ Domoticz.Debug("Heartbeating...")
+diff --git push/MQTTPush.h push/MQTTPush.h
+index 0773b43..d9f9332 100644
+--- push/MQTTPush.h
++++ push/MQTTPush.h
+@@ -14,7 +14,7 @@ public:
+ void on_message(const struct mosquitto_message* message) override;
+ void on_connect(int rc) override;
+ void on_disconnect(int rc) override;
+- void on_going_down();
++ void on_going_down() override;
+ private:
+ struct _tPushItem
+ {
+diff --git tcpserver/TCPClient.cpp tcpserver/TCPClient.cpp
+index d55da10..3eee093 100644
+--- tcpserver/TCPClient.cpp
++++ tcpserver/TCPClient.cpp
+@@ -19,7 +19,7 @@ namespace tcp {
+ delete socket_;
+ }
+
+- CTCPClient::CTCPClient(boost::asio::io_service& ios, CTCPServerIntBase* pManager)
++ CTCPClient::CTCPClient(boost::asio::io_context& ios, CTCPServerIntBase* pManager)
+ : CTCPClientBase(pManager)
+ {
+ socket_ = new boost::asio::ip::tcp::socket(ios);
+diff --git tcpserver/TCPClient.h tcpserver/TCPClient.h
+index df4350d..e7a882b 100644
+--- tcpserver/TCPClient.h
++++ tcpserver/TCPClient.h
+@@ -38,7 +38,7 @@ class CTCPClient : public CTCPClientBase,
+ public std::enable_shared_from_this<CTCPClient>
+ {
+ public:
+- CTCPClient(boost::asio::io_service& ios, CTCPServerIntBase *pManager);
++ CTCPClient(boost::asio::io_context& ios, CTCPServerIntBase *pManager);
+ ~CTCPClient() = default;
+ void start() override;
+ void stop() override;
+diff --git tcpserver/TCPServer.cpp tcpserver/TCPServer.cpp
+index 91fdc7e..57f8709 100644
+--- tcpserver/TCPServer.cpp
++++ tcpserver/TCPServer.cpp
+@@ -18,14 +18,14 @@ namespace tcp {
+
+ CTCPServerInt::CTCPServerInt(const std::string& address, const std::string& port, CTCPServer* pRoot) :
+ CTCPServerIntBase(pRoot),
+- io_service_(),
+- acceptor_(io_service_)
++ io_context_(),
++ acceptor_(io_context_)
+ {
+ // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
+- boost::asio::ip::tcp::resolver resolver(io_service_);
+- boost::asio::ip::tcp::resolver::query query(address, port);
+- boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+- acceptor_.open(endpoint.protocol());
++ boost::asio::ip::tcp::resolver resolver(io_context_);
++ boost::asio::ip::basic_resolver<boost::asio::ip::tcp>::results_type endpoints = resolver.resolve(address, port);
++ auto endpoint = *endpoints.begin();
++ acceptor_.open(endpoint.endpoint().protocol());
+ acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+ // bind to both ipv6 and ipv4 sockets for the "::" address only
+ if (address == "::")
+@@ -35,7 +35,7 @@ namespace tcp {
+ acceptor_.bind(endpoint);
+ acceptor_.listen();
+
+- new_connection_ = std::make_shared<CTCPClient>(io_service_, this);
++ new_connection_ = std::make_shared<CTCPClient>(io_context_, this);
+ if (new_connection_ == nullptr)
+ {
+ _log.Log(LOG_ERROR, "Error creating new client!");
+@@ -47,24 +47,24 @@ namespace tcp {
+
+ void CTCPServerInt::start()
+ {
+- // The io_service::run() call will block until all asynchronous operations
++ // The io_context::run() call will block until all asynchronous operations
+ // have finished. While the server is running, there is always at least one
+ // asynchronous operation outstanding: the asynchronous accept call waiting
+ // for new incoming connections.
+- io_service_.run();
++ io_context_.run();
+ }
+
+ void CTCPServerInt::stop()
+ {
+ // Post a call to the stop function so that server::stop() is safe to call
+ // from any thread.
+- io_service_.post([this] { handle_stop(); });
++ boost::asio::post([this] { handle_stop(); });
+ }
+
+ void CTCPServerInt::handle_stop()
+ {
+ // The server is stopped by cancelling all outstanding asynchronous
+- // operations. Once all operations have finished the io_service::run() call
++ // operations. Once all operations have finished the io_context::run() call
+ // will exit.
+ acceptor_.close();
+ stopAllClients();
+@@ -88,7 +88,7 @@ namespace tcp {
+ connections_.insert(new_connection_);
+ new_connection_->start();
+
+- new_connection_.reset(new CTCPClient(io_service_, this));
++ new_connection_.reset(new CTCPClient(io_context_, this));
+
+ acceptor_.async_accept(*(new_connection_->socket()), [this](auto&& err) { handleAccept(err); });
+ }
+diff --git tcpserver/TCPServer.h tcpserver/TCPServer.h
+index ca611b1..17284ca 100644
+--- tcpserver/TCPServer.h
++++ tcpserver/TCPServer.h
+@@ -70,8 +70,8 @@ private:
+ /// Handle a request to stop the server.
+ void handle_stop();
+
+- /// The io_service used to perform asynchronous operations.
+- boost::asio::io_service io_service_;
++ /// The io_context used to perform asynchronous operations.
++ boost::asio::io_context io_context_;
+
+ boost::asio::ip::tcp::acceptor acceptor_;
+
+diff --git webserver/cWebem.cpp webserver/cWebem.cpp
+index 57d9683..c0d292d 100644
+--- webserver/cWebem.cpp
++++ webserver/cWebem.cpp
+@@ -47,13 +47,13 @@ namespace http {
+ , myRequestHandler(doc_root, this)
+ // Rene, make sure we initialize m_sessions first, before starting a server
+ , myServer(server_factory::create(settings, myRequestHandler))
+- , m_io_service()
+- , m_session_clean_timer(m_io_service, boost::posix_time::minutes(1))
++ , m_io_context()
++ , m_session_clean_timer(m_io_context, boost::posix_time::minutes(1))
+ {
+ // associate handler to timer and schedule the first iteration
+ m_session_clean_timer.async_wait([this](auto &&) { CleanSessions(); });
+- m_io_service_thread = std::make_shared<std::thread>([p = &m_io_service] { p->run(); });
+- SetThreadName(m_io_service_thread->native_handle(), "Webem_ssncleaner");
++ m_io_context_thread = std::make_shared<std::thread>([p = &m_io_context] { p->run(); });
++ SetThreadName(m_io_context_thread->native_handle(), "Webem_ssncleaner");
+ }
+
+ cWebem::~cWebem()
+@@ -93,14 +93,14 @@ namespace http {
+ // Stop session cleaner
+ try
+ {
+- if (!m_io_service.stopped())
++ if (!m_io_context.stopped())
+ {
+- m_io_service.stop();
++ m_io_context.stop();
+ }
+- if (m_io_service_thread)
++ if (m_io_context_thread)
+ {
+- m_io_service_thread->join();
+- m_io_service_thread.reset();
++ m_io_context_thread->join();
++ m_io_context_thread.reset();
+ }
+ }
+ catch (...)
+diff --git webserver/cWebem.h webserver/cWebem.h
+index 6e3b899..7905c45 100644
+--- webserver/cWebem.h
++++ webserver/cWebem.h
+@@ -259,9 +259,9 @@ namespace http
+ std::string m_webRoot;
+ /// sessions management
+ std::mutex m_sessionsMutex;
+- boost::asio::io_service m_io_service;
++ boost::asio::io_context m_io_context;
+ boost::asio::deadline_timer m_session_clean_timer;
+- std::shared_ptr<std::thread> m_io_service_thread;
++ std::shared_ptr<std::thread> m_io_context_thread;
+ };
+
+ } // namespace server
+diff --git webserver/connection.cpp webserver/connection.cpp
+index 40f9788..3a70924 100644
+--- webserver/connection.cpp
++++ webserver/connection.cpp
+@@ -22,13 +22,13 @@ namespace http {
+ extern time_t last_write_time(const std::string& path);
+
+ // this is the constructor for plain connections
+- connection::connection(boost::asio::io_service &io_service, connection_manager &manager, request_handler &handler, int read_timeout)
++ connection::connection(boost::asio::io_context &io_context, connection_manager &manager, request_handler &handler, int read_timeout)
+ : send_buffer_(nullptr)
+ , read_timeout_(read_timeout)
+- , read_timer_(io_service, boost::posix_time::seconds(read_timeout))
++ , read_timer_(io_context, boost::posix_time::seconds(read_timeout))
+ , default_abandoned_timeout_(20 * 60)
+ // 20mn before stopping abandoned connection
+- , abandoned_timer_(io_service, boost::posix_time::seconds(default_abandoned_timeout_))
++ , abandoned_timer_(io_context, boost::posix_time::seconds(default_abandoned_timeout_))
+ , connection_manager_(manager)
+ , request_handler_(handler)
+ , status_(INITIALIZING)
+@@ -39,18 +39,18 @@ namespace http {
+ keepalive_ = false;
+ write_in_progress = false;
+ connection_type = ConnectionType::connection_http;
+- socket_ = std::make_unique<boost::asio::ip::tcp::socket>(io_service);
++ socket_ = std::make_unique<boost::asio::ip::tcp::socket>(io_context);
+ }
+
+ #ifdef WWW_ENABLE_SSL
+ // this is the constructor for secure connections
+- connection::connection(boost::asio::io_service &io_service, connection_manager &manager, request_handler &handler, int read_timeout, boost::asio::ssl::context &context)
++ connection::connection(boost::asio::io_context &io_context, connection_manager &manager, request_handler &handler, int read_timeout, boost::asio::ssl::context &context)
+ : send_buffer_(nullptr)
+ , read_timeout_(read_timeout)
+- , read_timer_(io_service, boost::posix_time::seconds(read_timeout))
++ , read_timer_(io_context, boost::posix_time::seconds(read_timeout))
+ , default_abandoned_timeout_(20 * 60)
+ // 20mn before stopping abandoned connection
+- , abandoned_timer_(io_service, boost::posix_time::seconds(default_abandoned_timeout_))
++ , abandoned_timer_(io_context, boost::posix_time::seconds(default_abandoned_timeout_))
+ , connection_manager_(manager)
+ , request_handler_(handler)
+ , status_(INITIALIZING)
+@@ -62,7 +62,7 @@ namespace http {
+ write_in_progress = false;
+ connection_type = ConnectionType::connection_http;
+ socket_ = nullptr;
+- sslsocket_ = std::make_unique<ssl_socket>(io_service, context);
++ sslsocket_ = std::make_unique<ssl_socket>(io_context, context);
+ }
+ #endif
+
+@@ -152,9 +152,9 @@ namespace http {
+ if (error != boost::asio::error::operation_aborted) {
+ switch (connection_type) {
+ case ConnectionType::connection_http:
+- // Timers should be cancelled before stopping to remove tasks from the io_service.
+- // The io_service will stop naturally when every tasks are removed.
+- // If timers are not cancelled, the exception ERROR_ABANDONED_WAIT_0 is thrown up to the io_service::run() caller.
++ // Timers should be cancelled before stopping to remove tasks from the io_context.
++ // The io_context will stop naturally when every tasks are removed.
++ // If timers are not cancelled, the exception ERROR_ABANDONED_WAIT_0 is thrown up to the io_context::run() caller.
+ cancel_abandoned_timeout();
+ cancel_read_timeout();
+
+@@ -372,7 +372,7 @@ namespace http {
+ switch (connection_type)
+ {
+ case ConnectionType::connection_http:
+- begin = boost::asio::buffer_cast<const char*>(_buf.data());
++ begin = static_cast<const char*>(_buf.data().data());
+ try
+ {
+ request_parser_.reset();
+@@ -404,7 +404,7 @@ namespace http {
+ newt = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+ }
+
+- size_t sizeread = begin - boost::asio::buffer_cast<const char*>(_buf.data());
++ size_t sizeread = begin - static_cast<const char*>(_buf.data().data());
+ _buf.consume(sizeread);
+ reply_.reset();
+ const char* pConnection = request_.get_req_header(&request_, "Connection");
+@@ -520,7 +520,7 @@ namespace http {
+ break;
+ case ConnectionType::connection_websocket:
+ case ConnectionType::connection_websocket_closing:
+- begin = boost::asio::buffer_cast<const char*>(_buf.data());
++ begin = static_cast<const char*>(_buf.data().data());
+ result = websocket_parser.parse((const unsigned char*)begin, _buf.size(), bytes_consumed, keepalive_);
+ _buf.consume(bytes_consumed);
+ if (result) {
+diff --git webserver/connection.hpp webserver/connection.hpp
+index ce452b5..c1a82c5 100644
+--- webserver/connection.hpp
++++ webserver/connection.hpp
+@@ -43,11 +43,11 @@ namespace http {
+ std::string host_local_endpoint_port_;
+ std::string host_last_request_uri_;
+ };
+- /// Construct a connection with the given io_service.
+- explicit connection(boost::asio::io_service& io_service,
++ /// Construct a connection with the given io_context.
++ explicit connection(boost::asio::io_context& io_context,
+ connection_manager& manager, request_handler& handler, int timeout);
+ #ifdef WWW_ENABLE_SSL
+- explicit connection(boost::asio::io_service& io_service,
++ explicit connection(boost::asio::io_context& io_context,
+ connection_manager& manager, request_handler& handler, int timeout, boost::asio::ssl::context& context);
+ #endif
+ ~connection() = default;
+diff --git webserver/server.cpp webserver/server.cpp
+index da15887..8bdfc13 100644
+--- webserver/server.cpp
++++ webserver/server.cpp
+@@ -13,15 +13,15 @@ namespace http {
+ namespace server {
+
+ server_base::server_base(const server_settings &settings, request_handler &user_request_handler)
+- : io_service_()
+- , acceptor_(io_service_)
++ : io_context_()
++ , acceptor_(io_context_)
+ , request_handler_(user_request_handler)
+ , settings_(settings)
+ , timeout_(20)
+ , // default read timeout in seconds
+ is_running(false)
+ , is_stop_complete(false)
+- , m_heartbeat_timer(io_service_)
++ , m_heartbeat_timer(io_context_)
+ {
+ if (!settings.is_enabled())
+ {
+@@ -39,10 +39,10 @@ namespace server {
+ }
+
+ // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
+- boost::asio::ip::tcp::resolver resolver(io_service_);
+- boost::asio::ip::tcp::resolver::query query(settings_.listening_address, settings_.listening_port);
+- boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+- acceptor_.open(endpoint.protocol());
++ boost::asio::ip::tcp::resolver resolver(io_context_);
++ boost::asio::ip::basic_resolver<boost::asio::ip::tcp>::results_type endpoints = resolver.resolve(settings_.listening_address, settings_.listening_port);
++ auto endpoint = *endpoints.begin();
++ acceptor_.open(endpoint.endpoint().protocol());
+ acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+ // bind to both ipv6 and ipv4 sockets for the "::" address only
+ if (settings_.listening_address == "::")
+@@ -59,28 +59,28 @@ namespace server {
+ }
+
+ void server_base::run() {
+- // The io_service::run() call will block until all asynchronous operations
++ // The io_context::run() call will block until all asynchronous operations
+ // have finished. While the server is running, there is always at least one
+ // asynchronous operation outstanding: the asynchronous accept call waiting
+ // for new incoming connections.
+ try {
+ is_running = true;
+ heart_beat(boost::system::error_code());
+- io_service_.run();
++ io_context_.run();
+ is_running = false;
+ } catch (std::exception& e) {
+ _log.Log(LOG_ERROR, "[web:%s] exception occurred : '%s' (need to run again)", settings_.listening_port.c_str(), e.what());
+ is_running = false;
+ // Note: if acceptor is up everything is OK, we can call run() again
+ // but if the exception has broken the acceptor we cannot stop/start it and the next run() will exit immediatly.
+- io_service_.reset(); // this call is needed before calling run() again
++ io_context_.restart(); // this call is needed before calling run() again
+ throw;
+ } catch (...) {
+ _log.Log(LOG_ERROR, "[web:%s] unknown exception occurred (need to run again)", settings_.listening_port.c_str());
+ is_running = false;
+ // Note: if acceptor is up everything is OK, we can call run() again
+ // but if the exception has broken the acceptor we cannot stop/start it and the next run() will exit immediatly.
+- io_service_.reset(); // this call is needed before calling run() again
++ io_context_.restart(); // this call is needed before calling run() again
+ throw;
+ }
+ }
+@@ -89,12 +89,12 @@ void server_base::run() {
+ void server_base::stop() {
+ if (is_running) {
+ // Post a call to the stop function so that server_base::stop() is safe to call from any thread.
+- // Rene, set is_running to false, because the following is an io_service call, which makes is_running
++ // Rene, set is_running to false, because the following is an io_context call, which makes is_running
+ // never set to false whilst in the call itself
+ is_running = false;
+- io_service_.post([this] { handle_stop(); });
++ boost::asio::post(io_context_, [this] { handle_stop(); });
+ } else {
+- // if io_service is not running then the post call will not be performed
++ // if io_context is not running then the post call will not be performed
+ handle_stop();
+ }
+
+@@ -112,7 +112,7 @@ void server_base::stop() {
+ }
+ sleep_milliseconds(500);
+ }
+- io_service_.stop();
++ io_context_.stop();
+
+ // Deregister heartbeat
+ m_mainworker.HeartbeatRemove(std::string("WebServer:") + settings_.listening_port);
+@@ -136,7 +136,7 @@ void server_base::heart_beat(const boost::system::error_code& error)
+ m_mainworker.HeartbeatUpdate(std::string("WebServer:") + settings_.listening_port);
+
+ // Schedule next heartbeat
+- m_heartbeat_timer.expires_from_now(std::chrono::seconds(4));
++ m_heartbeat_timer.expires_after(std::chrono::seconds(4));
+ m_heartbeat_timer.async_wait([this](auto &&err) { heart_beat(err); });
+ }
+ }
+@@ -148,7 +148,7 @@ server::server(const server_settings &settings, request_handler &user_request_ha
+ }
+
+ void server::init_connection() {
+- new_connection_.reset(new connection(io_service_, connection_manager_, request_handler_, timeout_));
++ new_connection_.reset(new connection(io_context_, connection_manager_, request_handler_, timeout_));
+ }
+
+ /**
+@@ -157,7 +157,7 @@ void server::init_connection() {
+ void server::handle_accept(const boost::system::error_code& e) {
+ if (!e) {
+ connection_manager_.start(new_connection_);
+- new_connection_.reset(new connection(io_service_,
++ new_connection_.reset(new connection(io_context_,
+ connection_manager_, request_handler_, timeout_));
+ // listen for a subsequent request
+ acceptor_.async_accept(new_connection_->socket(), [this](auto &&err) { handle_accept(err); });
+@@ -267,7 +267,7 @@ void ssl_server::init_connection() {
+ } else {
+ _log.Log(LOG_ERROR, "[web:%s] missing SSL DH parameters file %s!", settings_.listening_port.c_str(), settings_.tmp_dh_file_path.c_str());
+ }
+- new_connection_.reset(new connection(io_service_, connection_manager_, request_handler_, timeout_, context_));
++ new_connection_.reset(new connection(io_context_, connection_manager_, request_handler_, timeout_, context_));
+ }
+
+ void ssl_server::reinit_connection()
+@@ -305,7 +305,7 @@ void ssl_server::reinit_connection()
+ _log.Log(LOG_ERROR, "[web:%s] missing SSL DH parameters from file %s", settings_.listening_port.c_str(), settings_.tmp_dh_file_path.c_str());
+ }
+ }
+- new_connection_.reset(new connection(io_service_, connection_manager_, request_handler_, timeout_, context_));
++ new_connection_.reset(new connection(io_context_, connection_manager_, request_handler_, timeout_, context_));
+ }
+
+ /**
+diff --git webserver/server.hpp webserver/server.hpp
+index f9e71c5..bd7132a 100644
+--- webserver/server.hpp
++++ webserver/server.hpp
+@@ -31,7 +31,7 @@ namespace http
+ explicit server_base(const server_settings &settings, request_handler &user_request_handler);
+ virtual ~server_base() = default;
+
+- /// Run the server's io_service loop.
++ /// Run the server's io_context loop.
+ void run();
+
+ /// Stop the server.
+@@ -46,8 +46,8 @@ namespace http
+ protected:
+ void init(const init_connectionhandler_func &init_connection_handler, accept_handler_func accept_handler);
+
+- /// The io_service used to perform asynchronous operations.
+- boost::asio::io_service io_service_;
++ /// The io_context used to perform asynchronous operations.
++ boost::asio::io_context io_context_;
+
+ /// Acceptor used to listen for incoming connections.
+ boost::asio::ip::tcp::acceptor acceptor_;
diff --git a/www/domoticz/Makefile b/www/domoticz/Makefile
index 769b4d500821..51b10699d732 100644
--- a/www/domoticz/Makefile
+++ b/www/domoticz/Makefile
@@ -1,5 +1,6 @@
PORTNAME= domoticz
DISTVERSION= 2024.7
+PORTREVISION= 1
CATEGORIES= www
MAINTAINER= kiwi@FreeBSD.org
@@ -9,8 +10,6 @@ WWW= https://www.domoticz.com
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/License.txt
-BROKEN= fails to build with Boost>=1.87
-
LIB_DEPENDS= libcurl.so:ftp/curl \
libboost_system.so:devel/boost-libs \
libjsoncpp.so:devel/jsoncpp \
diff --git a/www/domoticz/files/patch-pr6252 b/www/domoticz/files/patch-pr6252
new file mode 100644
index 000000000000..34c4efd3f4e4
--- /dev/null
+++ b/www/domoticz/files/patch-pr6252
@@ -0,0 +1,2178 @@
+Fix for boost 1.87
+
+Removed the diff for the msbuild project files, didn't apply cleanly and not relevant anyway.
+This will merged in the next stable of domoticz.
+
+Pullrequest: https://github.com/domoticz/domoticz/pull/6252
+Patch: https://patch-diff.githubusercontent.com/raw/domoticz/domoticz/pull/6252.patch-diff
+
+diff --git hardware/ASyncSerial.cpp hardware/ASyncSerial.cpp
+index 52c950d..6147cdb 100644
+--- hardware/ASyncSerial.cpp
++++ hardware/ASyncSerial.cpp
+@@ -54,7 +54,7 @@ public:
+ {
+ }
+
+- boost::asio::io_service io; ///< Io service object
++ boost::asio::io_context io; ///< Io service object
+ boost::asio::serial_port port; ///< Serial port object
+ boost::thread backgroundThread; ///< Thread that runs read/write operations
+ bool open{ false }; ///< True if port open
+@@ -117,10 +117,10 @@ void AsyncSerial::open(const std::string& devname, unsigned int baud_rate,
+ throw;
+ }
+
+- pimpl->io.reset();
++ pimpl->io.restart();
+
+- // This gives some work to the io_service before it is started
+- pimpl->io.post([this] { return doRead(); });
++ // This gives some work to the io_context before it is started
++ boost::asio::post(pimpl->io, [this] { return doRead(); });
+
+ boost::thread t([p = &pimpl->io] { p->run(); });
+ pimpl->backgroundThread.swap(t);
+@@ -149,10 +149,10 @@ void AsyncSerial::openOnlyBaud(const std::string& devname, unsigned int baud_rat
+ throw;
+ }
+
+- pimpl->io.reset();
++ pimpl->io.restart();
+
+- //This gives some work to the io_service before it is started
+- pimpl->io.post([this] { return doRead(); });
++ //This gives some work to the io_context before it is started
++ boost::asio::post(pimpl->io, [this] { return doRead(); });
+
+ boost::thread t([p = &pimpl->io] { p->run(); });
+ pimpl->backgroundThread.swap(t);
+@@ -176,9 +176,9 @@ void AsyncSerial::close()
+ if(!isOpen()) return;
+
+ pimpl->open = false;
+- pimpl->io.post([this] { doClose(); });
++ boost::asio::post(pimpl->io, [this] { doClose(); });
+ pimpl->backgroundThread.join();
+- pimpl->io.reset();
++ pimpl->io.restart();
+ if(errorStatus())
+ {
+ throw(boost::system::system_error(boost::system::error_code(),
+@@ -192,7 +192,7 @@ void AsyncSerial::write(const char *data, size_t size)
+ std::lock_guard<std::mutex> l(pimpl->writeQueueMutex);
+ pimpl->writeQueue.insert(pimpl->writeQueue.end(),data,data+size);
+ }
+- pimpl->io.post([this] { doWrite(); });
++ boost::asio::post(pimpl->io, [this] { doWrite(); });
+ }
+
+ void AsyncSerial::write(const std::string &data)
+@@ -201,7 +201,7 @@ void AsyncSerial::write(const std::string &data)
+ std::lock_guard<std::mutex> l(pimpl->writeQueueMutex);
+ pimpl->writeQueue.insert(pimpl->writeQueue.end(), data.c_str(), data.c_str()+data.size());
+ }
+- pimpl->io.post([this] { doWrite(); });
++ boost::asio::post(pimpl->io, [this] { doWrite(); });
+ }
+
+ void AsyncSerial::write(const std::vector<char>& data)
+@@ -211,7 +211,7 @@ void AsyncSerial::write(const std::vector<char>& data)
+ pimpl->writeQueue.insert(pimpl->writeQueue.end(),data.begin(),
+ data.end());
+ }
+- pimpl->io.post([this] { doWrite(); });
++ boost::asio::post(pimpl->io, [this] { doWrite(); });
+ }
+
+ void AsyncSerial::writeString(const std::string& s)
+@@ -220,7 +220,7 @@ void AsyncSerial::writeString(const std::string& s)
+ std::lock_guard<std::mutex> l(pimpl->writeQueueMutex);
+ pimpl->writeQueue.insert(pimpl->writeQueue.end(),s.begin(),s.end());
+ }
+- pimpl->io.post([this] { doWrite(); });
++ boost::asio::post(pimpl->io, [this] { doWrite(); });
+ }
+
+ void AsyncSerial::doRead()
+diff --git hardware/ASyncSerial.h hardware/ASyncSerial.h
+index 0a51ef0..de83f8a 100644
+--- hardware/ASyncSerial.h
++++ hardware/ASyncSerial.h
+@@ -123,27 +123,27 @@ class AsyncSerial : private domoticz::noncopyable
+
+ /**
+ * Callback called to start an asynchronous read operation.
+- * This callback is called by the io_service in the spawned thread.
++ * This callback is called by the io_context in the spawned thread.
+ */
+ void doRead();
+
+ /**
+ * Callback called at the end of the asynchronous operation.
+- * This callback is called by the io_service in the spawned thread.
++ * This callback is called by the io_context in the spawned thread.
+ */
+ void readEnd(const boost::system::error_code &error, size_t bytes_transferred);
+
+ /**
+ * Callback called to start an asynchronous write operation.
+ * If it is already in progress, does nothing.
+- * This callback is called by the io_service in the spawned thread.
++ * This callback is called by the io_context in the spawned thread.
+ */
+ void doWrite();
+
+ /**
+ * Callback called at the end of an asynchronuous write operation,
+ * if there is more data to write, restarts a new write operation.
+- * This callback is called by the io_service in the spawned thread.
++ * This callback is called by the io_context in the spawned thread.
+ */
+ void writeEnd(const boost::system::error_code &error);
+
+diff --git hardware/ASyncTCP.cpp hardware/ASyncTCP.cpp
+index a375561..7c3b536 100644
+--- hardware/ASyncTCP.cpp
++++ hardware/ASyncTCP.cpp
+@@ -4,213 +4,241 @@
+ #include <boost/system/error_code.hpp> // for error_code
+ #include "../main/Logger.h"
+
+-struct hostent;
+-
+ #define MAX_TCP_BUFFER_SIZE 4096
+
+-#ifndef WIN32
+- #include <unistd.h> //gethostbyname
+-#endif
+-
+ #define STATUS_OK(err) !err
+-
+-ASyncTCP::ASyncTCP(const bool secure)
++#define STATUS_ERR(err) err
++
++ASyncTCP::ASyncTCP(const bool secure) :
++ m_Tcpwork(boost::asio::make_work_guard(m_io_context))
++ , m_Socket(m_io_context)
++ , m_Resolver(m_io_context)
++ , m_ReconnectTimer(m_io_context)
++ , m_TimeoutTimer(m_io_context)
++ , m_SendStrand(m_io_context)
+ #ifdef WWW_ENABLE_SSL
+- : mSecure(secure)
++ , m_bSecure(secure)
+ #endif
+ {
+ m_pRXBuffer = new uint8_t[MAX_TCP_BUFFER_SIZE];
+ #ifdef WWW_ENABLE_SSL
+ mContext.set_verify_mode(boost::asio::ssl::verify_none);
+- if (mSecure)
++ if (m_bSecure)
+ {
+- mSslSocket.reset(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(mIos, mContext));
++ m_SslSocket.reset(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(m_io_context, mContext));
+ }
+ #endif
+ }
+
+ ASyncTCP::~ASyncTCP()
+ {
+- assert(mTcpthread == nullptr);
+- mIsTerminating = true;
+- if (mTcpthread)
++ assert(m_Tcpthread == nullptr);
++ m_bIsTerminating = true;
++ if (m_Tcpthread)
+ {
+ //This should never happen. terminate() never called!!
+- _log.Log(LOG_ERROR, "ASyncTCP: Workerthread not closed. terminate() never called!!!");
+- mIos.stop();
+- if (mTcpthread)
++ _log.Log(LOG_ERROR, "ASyncTCP: Worker thread not closed. terminate() never called!!!");
++ m_io_context.stop();
++ if (m_Tcpthread)
+ {
+- mTcpthread->join();
+- mTcpthread.reset();
++ m_Tcpthread->join();
++ m_Tcpthread.reset();
+ }
+ }
+ if (m_pRXBuffer != nullptr)
+ delete[] m_pRXBuffer;
+ }
+
+-void ASyncTCP::SetReconnectDelay(int32_t Delay)
++void ASyncTCP::SetReconnectDelay(const int32_t Delay)
+ {
+- mReconnectDelay = Delay;
++ m_iReconnectDelay = Delay;
+ }
+
+ void ASyncTCP::connect(const std::string& ip, uint16_t port)
+ {
+- assert(!mSocket.is_open());
+- if (mSocket.is_open())
++ assert(!m_Socket.is_open());
++ if (m_Socket.is_open())
+ {
+ _log.Log(LOG_ERROR, "ASyncTCP: connect called while socket is still open. !!!");
+ terminate();
+ }
+
+- // RK: We reset mIos here because it might have been stopped in terminate()
+- mIos.reset();
+- // RK: After the reset, we need to provide it work anew
+- mTcpwork = std::make_shared<boost::asio::io_service::work>(mIos);
+- if (!mTcpthread)
+- mTcpthread = std::make_shared<std::thread>([p = &mIos] { p->run(); });
+-
+- mIp = ip;
+- mPort = port;
++ m_IP = ip;
++ m_Port = port;
+ std::string port_str = std::to_string(port);
+- boost::asio::ip::tcp::resolver::query query(ip, port_str);
+ timeout_start_timer();
+- mResolver.async_resolve(query, [this](auto &&err, auto &&iter) { cb_resolve_done(err, iter); });
++
++ m_Resolver.async_resolve(
++ ip, port_str,
++ [this](const boost::system::error_code& error, const boost::asio::ip::tcp::resolver::results_type& endpoints) {
++ handle_resolve(error, endpoints);
++ }
++ );
++
++ // RK: We restart m_io_context here because it might have been stopped in terminate()
++ m_io_context.restart();
++ // RK: After the reset, we need to provide it work anew
++ m_Tcpwork.reset();
++ m_Tcpwork.emplace(boost::asio::make_work_guard(m_io_context));
++ if (!m_Tcpthread)
++ m_Tcpthread = std::make_shared<std::thread>([p = &m_io_context] { p->run(); });
+ }
+
+-void ASyncTCP::cb_resolve_done(const boost::system::error_code& error, boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
++void ASyncTCP::handle_resolve(const boost::system::error_code& error, const boost::asio::ip::tcp::resolver::results_type &endpoints)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
+- {
+- connect_start(endpoint_iterator);
+- }
+- else
++ if (STATUS_ERR(error))
+ {
+ process_error(error);
++ return;
+ }
+-}
+-
+-void ASyncTCP::connect_start(boost::asio::ip::tcp::resolver::iterator& endpoint_iterator)
+-{
+- if (mIsConnected) return;
+-
+- mEndPoint = *endpoint_iterator++;
++ if (m_bIsConnected) return;
+
+ timeout_start_timer();
++
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
++ if (m_bSecure)
+ {
+ // we reset the ssl socket, because the ssl context needs to be reinitialized after a reconnect
+- mSslSocket.reset(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(mIos, mContext));
+- mSslSocket->lowest_layer().async_connect(mEndPoint, [this, endpoint_iterator](auto &&err) mutable { cb_connect_done(err, endpoint_iterator); });
++ m_SslSocket.reset(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(m_io_context, mContext));
++ boost::asio::async_connect(m_SslSocket->lowest_layer(), endpoints,
++ [this](const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& endpoint)
++ {
++ handle_connect(error, endpoint);
++ }
++ );
+ }
+ else
+ #endif
+ {
+- mSocket.async_connect(mEndPoint, [this, endpoint_iterator](auto &&err) mutable { cb_connect_done(err, endpoint_iterator); });
++ boost::asio::async_connect(m_Socket, endpoints,
++ [this](const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& endpoint)
++ {
++ handle_connect(error, endpoint);
++ }
++ );
+ }
+ }
+
+-void ASyncTCP::cb_connect_done(const boost::system::error_code& error, boost::asio::ip::tcp::resolver::iterator &endpoint_iterator)
++void ASyncTCP::handle_connect(const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& /*endpoint*/)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
++ if (STATUS_ERR(error))
+ {
++ process_error(error);
++ return;
++ }
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
+- {
+- timeout_start_timer();
+- mSslSocket->async_handshake(boost::asio::ssl::stream_base::client, [this](auto &&err) { cb_handshake_done(err); });
+- }
+- else
+-#endif
+- {
+- process_connection();
+- }
++ if (m_bSecure)
++ {
++ timeout_start_timer();
++ m_SslSocket->async_handshake(boost::asio::ssl::stream_base::client,
++ [this](const boost::system::error_code& error) {
++ cb_handshake_done(error);
++ }
++ );
+ }
+- else
++ else
++#endif
+ {
+- if (endpoint_iterator != boost::asio::ip::tcp::resolver::iterator())
+- {
+- // The connection failed. Try the next endpoint in the list.
+- connect_start(endpoint_iterator);
+- return;
+- }
+- process_error(error);
++ process_connection();
+ }
+ }
+
+ #ifdef WWW_ENABLE_SSL
+ void ASyncTCP::cb_handshake_done(const boost::system::error_code& error)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
+- {
+- process_connection();
+- }
+- else
++ if (STATUS_ERR(error))
+ {
+ process_error(error);
++ return;
+ }
++ process_connection();
++#endif
+ }
++
++void ASyncTCP::process_connection()
++{
++ m_bIsConnected = true;
++#ifdef WWW_ENABLE_SSL
++
++ if (!m_bSecure)
+ #endif
++ {
++ // RK: only if non-secure
++ boost::asio::socket_base::keep_alive option(true);
++ m_Socket.set_option(option);
++ }
++ OnConnect();
++ do_read_start();
++ do_write_start();
++}
+
+ void ASyncTCP::reconnect_start_timer()
+ {
+- if (mIsReconnecting) return;
++ if (m_bIsReconnecting) return;
+
+- if (mReconnectDelay != 0)
++ if (m_iReconnectDelay != 0)
+ {
+- mIsReconnecting = true;
+-
+- mReconnectTimer.expires_from_now(boost::posix_time::seconds(mReconnectDelay));
+- mReconnectTimer.async_wait([this](auto &&err) { cb_reconnect_start(err); });
++ m_bIsReconnecting = true;
++
++ m_ReconnectTimer.expires_from_now(boost::posix_time::seconds(m_iReconnectDelay));
++ m_ReconnectTimer.async_wait(
++ [this](const boost::system::error_code& error) {
++ cb_reconnect_start(error);
++ }
++ );
+ }
+ }
+
+ void ASyncTCP::cb_reconnect_start(const boost::system::error_code& error)
+ {
+- mIsReconnecting = false;
+- mReconnectTimer.cancel();
+- mTimeoutTimer.cancel();
++ m_bIsReconnecting = false;
++ m_ReconnectTimer.cancel();
++ m_TimeoutTimer.cancel();
+
+- if (mIsConnected) return;
++ if (m_bIsConnected) return;
+ if (error) return; // timer was cancelled
+
+ do_close();
+- connect(mIp, mPort);
++ connect(m_IP, m_Port);
+ }
+
+
+ void ASyncTCP::terminate(const bool silent)
+ {
+- mIsTerminating = true;
++ m_bIsTerminating = true;
+ disconnect(silent);
+- mTcpwork.reset();
+- mIos.stop();
+- if (mTcpthread)
++ m_Tcpwork.reset();
++ m_io_context.stop();
++ if (m_Tcpthread)
+ {
+- mTcpthread->join();
+- mTcpthread.reset();
++ m_Tcpthread->join();
++ m_Tcpthread.reset();
+ }
+- mIsReconnecting = false;
+- mIsConnected = false;
+- mWriteQ.clear();
+- mIsTerminating = false;
++ m_bIsReconnecting = false;
++ m_bIsConnected = false;
++ m_WriteQ.clear();
++ m_bIsTerminating = false;
+ }
+
+ void ASyncTCP::disconnect(const bool silent)
+ {
+- mReconnectTimer.cancel();
+- mTimeoutTimer.cancel();
+- if (!mTcpthread) return;
++ m_ReconnectTimer.cancel();
++ m_TimeoutTimer.cancel();
++ if (!m_Tcpthread) return;
+
+ try
+ {
+- mIos.post([this] { do_close(); });
++ boost::asio::post(m_io_context,
++ [this] {
++ do_close();
++ }
++ );
+ }
+ catch (...)
+ {
+@@ -223,62 +251,68 @@ void ASyncTCP::disconnect(const bool silent)
+
+ void ASyncTCP::do_close()
+ {
+- if (mIsReconnecting) {
++ if (m_bIsReconnecting) {
+ return;
+ }
+- mReconnectTimer.cancel();
+- mTimeoutTimer.cancel();
++ m_ReconnectTimer.cancel();
++ m_TimeoutTimer.cancel();
+ boost::system::error_code ec;
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
++ if (m_bSecure)
+ {
+- if (mSslSocket->lowest_layer().is_open())
++ if (m_SslSocket->lowest_layer().is_open())
+ {
+- mSslSocket->lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
+- mSslSocket->lowest_layer().close(ec);
++ m_SslSocket->lowest_layer().shutdown(boost::asio::ip::tcp::socket::shutdown_both, ec);
++ m_SslSocket->lowest_layer().close(ec);
+ }
+ }
+ else
+ #endif
+ {
+- if (mSocket.is_open())
++ if (m_Socket.is_open())
+ {
+- mSocket.close(ec);
++ m_Socket.close(ec);
+ }
+ }
+ }
+
+ void ASyncTCP::do_read_start()
+ {
+- if (mIsTerminating) return;
+- if (!mIsConnected) return;
++ if (m_bIsTerminating) return;
++ if (!m_bIsConnected) return;
+
+ timeout_start_timer();
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
++ if (m_bSecure)
+ {
+- mSslSocket->async_read_some(boost::asio::buffer(m_pRXBuffer, MAX_TCP_BUFFER_SIZE), [this](auto &&err, auto bytes) { cb_read_done(err, bytes); });
++ m_SslSocket->async_read_some(boost::asio::buffer(m_pRXBuffer, MAX_TCP_BUFFER_SIZE),
++ [this](const boost::system::error_code& error, size_t bytes_transferred) {
++ cb_read_done(error, bytes_transferred);
++ }
++ );
+ }
+ else
+ #endif
+ {
+- mSocket.async_read_some(boost::asio::buffer(m_pRXBuffer, MAX_TCP_BUFFER_SIZE), [this](auto &&err, auto bytes) { cb_read_done(err, bytes); });
++ m_Socket.async_read_some(boost::asio::buffer(m_pRXBuffer, MAX_TCP_BUFFER_SIZE),
++ [this](const boost::system::error_code& error, size_t bytes_transferred) {
++ cb_read_done(error, bytes_transferred);
++ }
++ );
+ }
+ }
+
+ void ASyncTCP::cb_read_done(const boost::system::error_code& error, size_t bytes_transferred)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
+- {
+- OnData(m_pRXBuffer, bytes_transferred);
+- do_read_start();
+- }
+- else
++ if (STATUS_ERR(error))
+ {
+ process_error(error);
++ return;
+ }
++ OnData(m_pRXBuffer, bytes_transferred);
++ do_read_start();
+ }
+
+ void ASyncTCP::write(const uint8_t* pData, size_t length)
+@@ -288,77 +322,66 @@ void ASyncTCP::write(const uint8_t* pData, size_t length)
+
+ void ASyncTCP::write(const std::string& msg)
+ {
+- if (!mTcpthread) return;
++ if (!m_Tcpthread) return;
+
+- mSendStrand.post([this, msg]() { cb_write_queue(msg); });
++ boost::asio::post(m_SendStrand, [this, msg]() { cb_write_queue(msg); });
+ }
+
+ void ASyncTCP::cb_write_queue(const std::string& msg)
+ {
+- mWriteQ.push_back(msg);
++ m_WriteQ.push_back(msg);
+
+- if (mWriteQ.size() == 1)
++ if (m_WriteQ.size() == 1)
+ do_write_start();
+ }
+
+ void ASyncTCP::do_write_start()
+ {
+- if (mIsTerminating) return;
+- if (!mIsConnected) return;
+- if (mWriteQ.empty())
++ if (m_bIsTerminating) return;
++ if (!m_bIsConnected) return;
++ if (m_WriteQ.empty())
+ return;
+
+ timeout_start_timer();
+ #ifdef WWW_ENABLE_SSL
+- if (mSecure)
++ if (m_bSecure)
+ {
+- boost::asio::async_write(*mSslSocket, boost::asio::buffer(mWriteQ.front()), [this](auto &&err, auto) { cb_write_done(err); });
++ boost::asio::async_write(*m_SslSocket, boost::asio::buffer(m_WriteQ.front()),
++ [this](const boost::system::error_code& error, std::size_t length) {
++ cb_write_done(error, length);
++ }
++ );
+ }
+ else
+ #endif
+ {
+- boost::asio::async_write(mSocket, boost::asio::buffer(mWriteQ.front()), [this](auto &&err, auto) { cb_write_done(err); });
++ boost::asio::async_write(m_Socket, boost::asio::buffer(m_WriteQ.front()),
++ [this](const boost::system::error_code& error, std::size_t length) {
++ cb_write_done(error, length);
++ }
++ );
+ }
+ }
+
+-void ASyncTCP::cb_write_done(const boost::system::error_code& error)
++void ASyncTCP::cb_write_done(const boost::system::error_code& error, std::size_t /*length*/)
+ {
+- if (mIsTerminating) return;
++ if (m_bIsTerminating) return;
+
+- if (STATUS_OK(error))
+- {
+- mWriteQ.pop_front();
+- do_write_start();
+- }
+- else
++ if (STATUS_ERR(error))
+ {
+ process_error(error);
++ return;
+ }
+-}
+-
+-void ASyncTCP::process_connection()
+-{
+- mIsConnected = true;
+-#ifdef WWW_ENABLE_SSL
+-
+- if (!mSecure)
+-#endif
+- {
+- // RK: only if non-secure
+- boost::asio::socket_base::keep_alive option(true);
+- mSocket.set_option(option);
+- }
+- OnConnect();
+- do_read_start();
++ m_WriteQ.pop_front();
+ do_write_start();
+ }
+
+ void ASyncTCP::process_error(const boost::system::error_code& error)
+ {
+ do_close();
+- if (mIsConnected)
++ if (m_bIsConnected)
+ {
+- mIsConnected = false;
++ m_bIsConnected = false;
+ OnDisconnect();
+ }
+
+@@ -369,20 +392,23 @@ void ASyncTCP::process_error(const boost::system::error_code& error)
+ reconnect_start_timer();
+ }
+
+-/* timeout methods */
+ void ASyncTCP::timeout_start_timer()
+ {
+- if (0 == mTimeoutDelay) {
++ if (0 == m_iTimeoutDelay) {
+ return;
+ }
+ timeout_cancel_timer();
+- mTimeoutTimer.expires_from_now(boost::posix_time::seconds(mTimeoutDelay));
+- mTimeoutTimer.async_wait([this](auto &&err) { timeout_handler(err); });
++ m_TimeoutTimer.expires_from_now(boost::posix_time::seconds(m_iTimeoutDelay));
++ m_TimeoutTimer.async_wait(
++ [this](const boost::system::error_code& error) {
++ timeout_handler(error);
++ }
++ );
+ }
+
+ void ASyncTCP::timeout_cancel_timer()
+ {
+- mTimeoutTimer.cancel();
++ m_TimeoutTimer.cancel();
+ }
+
+ void ASyncTCP::timeout_handler(const boost::system::error_code& error)
+@@ -397,5 +423,5 @@ void ASyncTCP::timeout_handler(const boost::system::error_code& error)
+
+ void ASyncTCP::SetTimeout(const uint32_t Timeout)
+ {
+- mTimeoutDelay = Timeout;
++ m_iTimeoutDelay = Timeout;
+ }
+diff --git hardware/ASyncTCP.h hardware/ASyncTCP.h
+index cf859bb..a8b3ae2 100644
+--- hardware/ASyncTCP.h
++++ hardware/ASyncTCP.h
+@@ -3,39 +3,31 @@
+ #include <stddef.h> // for size_t
+ #include <deque> // for write queue
+ #include <boost/asio/deadline_timer.hpp> // for deadline_timer
+-#include <boost/asio/io_service.hpp> // for io_service
++#include <boost/asio/io_context.hpp> // for io_context
+ #include <boost/asio/strand.hpp> // for strand
+ #include <boost/asio/ip/tcp.hpp> // for tcp, tcp::endpoint, tcp::s...
+ #include <boost/asio/ssl.hpp> // for secure sockets
+ #include <boost/asio/ssl/stream.hpp> // for secure sockets
+ #include <exception> // for exception
++#include <optional> // for optional
+
+ #define ASYNCTCP_THREAD_NAME "ASyncTCP"
+ #define DEFAULT_RECONNECT_TIME 30
+ #define DEFAULT_TIMEOUT_TIME 60
+
+-namespace boost
+-{
+- namespace system
+- {
+- class error_code;
+- } // namespace system
+-} // namespace boost
+-
+ class ASyncTCP
+ {
+- protected:
++protected:
+ ASyncTCP(bool secure = false);
+ virtual ~ASyncTCP();
+-
+- void connect(const std::string &hostname, uint16_t port);
++ void connect(const std::string& hostname, uint16_t port);
+ void disconnect(bool silent = true);
+- void write(const std::string &msg);
+- void write(const uint8_t *pData, size_t length);
+- void SetReconnectDelay(int32_t Delay = DEFAULT_RECONNECT_TIME);
++ void write(const std::string& msg);
++ void write(const uint8_t* pData, size_t length);
++ void SetReconnectDelay(const int32_t Delay = DEFAULT_RECONNECT_TIME);
+ bool isConnected()
+ {
+- return mIsConnected;
++ return m_bIsConnected;
+ };
+ void terminate(bool silent = true);
+ void SetTimeout(uint32_t Timeout = DEFAULT_TIMEOUT_TIME);
+@@ -43,65 +35,61 @@ class ASyncTCP
+ // Callback interface to implement in derived classes
+ virtual void OnConnect() = 0;
+ virtual void OnDisconnect() = 0;
+- virtual void OnData(const uint8_t *pData, size_t length) = 0;
+- virtual void OnError(const boost::system::error_code &error) = 0;
+-
+- boost::asio::io_service mIos; // protected to allow derived classes to attach timers etc.
++ virtual void OnData(const uint8_t* pData, size_t length) = 0;
++ virtual void OnError(const boost::system::error_code& error) = 0;
+
+- private:
+- void cb_resolve_done(const boost::system::error_code &err, boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
+- void connect_start(boost::asio::ip::tcp::resolver::iterator &endpoint_iterator);
+- void cb_connect_done(const boost::system::error_code &error, boost::asio::ip::tcp::resolver::iterator &endpoint_iterator);
++ boost::asio::io_context m_io_context; // protected to allow derived classes to attach timers etc.
++private:
++ void handle_resolve(const boost::system::error_code& ec, const boost::asio::ip::tcp::resolver::results_type &results);
++ void handle_connect(const boost::system::error_code& error, const boost::asio::ip::tcp::endpoint& endpoint);
+ #ifdef WWW_ENABLE_SSL
+- void cb_handshake_done(const boost::system::error_code &error);
++ void cb_handshake_done(const boost::system::error_code& error);
+ #endif
+
+- /* timeout methods */
+ void timeout_start_timer();
+ void timeout_cancel_timer();
+ void reconnect_start_timer();
+- void timeout_handler(const boost::system::error_code &error);
++ void timeout_handler(const boost::system::error_code& error);
+
+- void cb_reconnect_start(const boost::system::error_code &error);
++ void cb_reconnect_start(const boost::system::error_code& error);
+
+ void do_close();
+
+ void do_read_start();
+- void cb_read_done(const boost::system::error_code &error, size_t bytes_transferred);
++ void cb_read_done(const boost::system::error_code& error, size_t bytes_transferred);
+
+- void cb_write_queue(const std::string &msg);
++ void cb_write_queue(const std::string& msg);
+ void do_write_start();
+- void cb_write_done(const boost::system::error_code &error);
++ void cb_write_done(const boost::system::error_code& error, size_t length);
+
+ void process_connection();
+- void process_error(const boost::system::error_code &error);
++ void process_error(const boost::system::error_code& error);
+
+- bool mIsConnected = false;
+- bool mIsReconnecting = false;
+- bool mIsTerminating = false;
++ bool m_bIsConnected = false;
++ bool m_bIsReconnecting = false;
++ bool m_bIsTerminating = false;
+
+- boost::asio::io_service::strand mSendStrand{ mIos };
+- std::deque<std::string> mWriteQ; // we need a write queue to allow concurrent writes
++ boost::asio::io_context::strand m_SendStrand;
++ std::deque<std::string> m_WriteQ; // we need a write queue to allow concurrent writes
+
+ uint8_t* m_pRXBuffer = nullptr;
+
+- int mReconnectDelay = DEFAULT_RECONNECT_TIME;
+- int mTimeoutDelay = 0;
+- boost::asio::deadline_timer mReconnectTimer{ mIos };
+- boost::asio::deadline_timer mTimeoutTimer{ mIos };
++ int m_iReconnectDelay = DEFAULT_RECONNECT_TIME;
++ int m_iTimeoutDelay = 0;
++ boost::asio::deadline_timer m_ReconnectTimer;
++ boost::asio::deadline_timer m_TimeoutTimer;
+
+- std::shared_ptr<std::thread> mTcpthread;
+- std::shared_ptr<boost::asio::io_service::work> mTcpwork;
++ std::shared_ptr<std::thread> m_Tcpthread;
++ std::optional<boost::asio::executor_work_guard<boost::asio::io_context::executor_type>> m_Tcpwork;
+
+ #ifdef WWW_ENABLE_SSL
+- const bool mSecure;
++ const bool m_bSecure;
+ boost::asio::ssl::context mContext{ boost::asio::ssl::context::sslv23 };
+- std::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>> mSslSocket; // the ssl socket
++ std::shared_ptr<boost::asio::ssl::stream<boost::asio::ip::tcp::socket>> m_SslSocket;
+ #endif
+- boost::asio::ip::tcp::socket mSocket{ mIos };
+- boost::asio::ip::tcp::endpoint mEndPoint;
+- boost::asio::ip::tcp::resolver mResolver{ mIos };
++ boost::asio::ip::tcp::socket m_Socket;
++ boost::asio::ip::tcp::resolver m_Resolver;
+
+- std::string mIp;
+- uint16_t mPort;
++ std::string m_IP;
++ uint16_t m_Port;
+ };
+diff --git hardware/Arilux.cpp hardware/Arilux.cpp
+index 400f5a3..20bc373 100644
+--- hardware/Arilux.cpp
++++ hardware/Arilux.cpp
+@@ -79,7 +79,7 @@ void Arilux::InsertUpdateSwitch(const std::string &lightName, const int subType,
+ {
+ uint32_t sID;
+ try {
+- sID = boost::asio::ip::address_v4::from_string(location).to_ulong();
++ sID = boost::asio::ip::make_address_v4(location).to_uint();
+ } catch (const std::exception &e) {
+ Log(LOG_ERROR, "Bad IP address: %s (%s)", location.c_str(), e.what());
+ return;
+@@ -112,8 +112,8 @@ bool Arilux::SendTCPCommand(uint32_t ip,std::vector<unsigned char> &command)
+ sum = sum & 0xFF;
+ command.push_back((unsigned char)sum);
+
+- boost::asio::io_service io_service;
+- boost::asio::ip::tcp::socket sendSocket(io_service);
++ boost::asio::io_context io_context;
++ boost::asio::ip::tcp::socket sendSocket(io_context);
+ boost::asio::ip::address_v4 address(ip);
+ boost::asio::ip::tcp::endpoint endpoint(address, 5577);
+ try
+diff --git hardware/Kodi.cpp hardware/Kodi.cpp
+index b528017..5ababf6 100644
+--- hardware/Kodi.cpp
++++ hardware/Kodi.cpp
+@@ -143,14 +143,14 @@ _eNotificationTypes CKodiNode::CKodiStatus::NotificationType()
+ }
+ }
+
+-CKodiNode::CKodiNode(boost::asio::io_service *pIos, const int pHwdID, const int PollIntervalsec, const int pTimeoutMs,
++CKodiNode::CKodiNode(boost::asio::io_context *pIoc, const int pHwdID, const int PollIntervalsec, const int pTimeoutMs,
+ const std::string& pID, const std::string& pName, const std::string& pIP, const std::string& pPort)
+ {
+ m_Busy = false;
+ m_Stoppable = false;
+ m_PlaylistPosition = 0;
+
+- m_Ios = pIos;
++ m_Ioc = pIoc;
+ m_HwdID = pHwdID;
+ m_DevID = atoi(pID.c_str());
+ sprintf(m_szDevID, "%X%02X%02X%02X", 0, 0, (m_DevID & 0xFF00) >> 8, m_DevID & 0xFF);
+@@ -581,11 +581,10 @@ void CKodiNode::handleConnect()
+ {
+ m_iMissedPongs = 0;
+ boost::system::error_code ec;
+- boost::asio::ip::tcp::resolver resolver(*m_Ios);
+- boost::asio::ip::tcp::resolver::query query(m_IP, (m_Port[0] != '-' ? m_Port : m_Port.substr(1)));
+- auto iter = resolver.resolve(query);
+- boost::asio::ip::tcp::endpoint endpoint = *iter;
+- m_Socket = new boost::asio::ip::tcp::socket(*m_Ios);
++ boost::asio::ip::tcp::resolver resolver(*m_Ioc);
++ auto iter = resolver.resolve(m_IP, (m_Port[0] != '-' ? m_Port : m_Port.substr(1)));
++ boost::asio::ip::tcp::endpoint endpoint = *iter.begin();
++ m_Socket = new boost::asio::ip::tcp::socket(*m_Ioc);
+ m_Socket->connect(endpoint, ec);
+ if (!ec)
+ {
+@@ -975,19 +974,19 @@ void CKodi::Do_Work()
+ _log.Log(LOG_NORM, "Kodi: (%s) - Restarting thread.", node->m_Name.c_str());
+ boost::thread *tAsync = new boost::thread(&CKodiNode::Do_Work, node);
+ SetThreadName(tAsync->native_handle(), "KodiNode");
+- m_ios.stop();
++ m_ioc.stop();
+ }
+ if (node->IsOn())
+ bWorkToDo = true;
+ }
+
+- if (bWorkToDo && m_ios.stopped()) // make sure that there is a boost thread to service i/o operations
++ if (bWorkToDo && m_ioc.stopped()) // make sure that there is a boost thread to service i/o operations
+ {
+- m_ios.reset();
++ m_ioc.restart();
+ // Note that this is the only thread that handles async i/o so we don't
+ // need to worry about locking or concurrency issues when processing messages
+ _log.Log(LOG_NORM, "Kodi: Restarting I/O service thread.");
+- boost::thread bt([p = &m_ios] { p->run(); });
++ boost::thread bt([p = &m_ioc] { p->run(); });
+ SetThreadName(bt.native_handle(), "KodiIO");
+ }
+ }
+@@ -1138,7 +1137,7 @@ void CKodi::ReloadNodes()
+ {
+ UnloadNodes();
+
+- m_ios.reset(); // in case this is not the first time in
++ m_ioc.restart(); // in case this is not the first time in
+
+ std::vector<std::vector<std::string> > result;
+ result = m_sql.safe_query("SELECT ID,Name,MacAddress,Timeout FROM WOLNodes WHERE (HardwareID==%d)", m_HwdID);
+@@ -1149,7 +1148,7 @@ void CKodi::ReloadNodes()
+ // create a vector to hold the nodes
+ for (const auto &sd : result)
+ {
+- auto pNode = std::make_shared<CKodiNode>(&m_ios, m_HwdID, m_iPollInterval, m_iPingTimeoutms, sd[0], sd[1], sd[2], sd[3]);
++ auto pNode = std::make_shared<CKodiNode>(&m_ioc, m_HwdID, m_iPollInterval, m_iPingTimeoutms, sd[0], sd[1], sd[2], sd[3]);
+ m_pNodes.push_back(pNode);
+ }
+ // start the threads to control each kodi
+@@ -1161,7 +1160,7 @@ void CKodi::ReloadNodes()
+ }
+ sleep_milliseconds(100);
+ _log.Log(LOG_NORM, "Kodi: Starting I/O service thread.");
+- boost::thread bt([p = &m_ios] { p->run(); });
++ boost::thread bt([p = &m_ioc] { p->run(); });
+ SetThreadName(bt.native_handle(), "KodiIO");
+ }
+ }
+@@ -1170,10 +1169,10 @@ void CKodi::UnloadNodes()
+ {
+ std::lock_guard<std::mutex> l(m_mutex);
+
+- m_ios.stop(); // stop the service if it is running
++ m_ioc.stop(); // stop the service if it is running
+ sleep_milliseconds(100);
+
+- while (((!m_pNodes.empty()) || (!m_ios.stopped())))
++ while (((!m_pNodes.empty()) || (!m_ioc.stopped())))
+ {
+ for (auto itt = m_pNodes.begin(); itt != m_pNodes.end(); ++itt)
+ {
+diff --git hardware/Kodi.h hardware/Kodi.h
+index 14f331c..4435740 100644
+--- hardware/Kodi.h
++++ hardware/Kodi.h
+@@ -150,7 +150,7 @@ class CKodiNode : public std::enable_shared_from_this<CKodiNode>, StoppableTask
+ };
+
+ public:
+- CKodiNode(boost::asio::io_service *, int, int, int, const std::string &, const std::string &, const std::string &, const std::string &);
++ CKodiNode(boost::asio::io_context *, int, int, int, const std::string &, const std::string &, const std::string &, const std::string &);
+ ~CKodiNode();
+ void Do_Work();
+ void SendCommand(const std::string &);
+@@ -207,7 +207,7 @@ class CKodiNode : public std::enable_shared_from_this<CKodiNode>, StoppableTask
+ int m_iPollIntSec;
+ int m_iMissedPongs;
+ std::string m_sLastMessage;
+- boost::asio::io_service *m_Ios;
++ boost::asio::io_context *m_Ioc;
+ boost::asio::ip::tcp::socket *m_Socket;
+ std::array<char, 256> m_Buffer;
+ };
+@@ -243,5 +243,5 @@ class CKodi : public CDomoticzHardwareBase
+ int m_iPingTimeoutms;
+ std::shared_ptr<std::thread> m_thread;
+ std::mutex m_mutex;
+- boost::asio::io_service m_ios;
++ boost::asio::io_context m_ioc;
+ };
+diff --git hardware/MQTTAutoDiscover.h hardware/MQTTAutoDiscover.h
+index 0832664..1501d6f 100644
+--- hardware/MQTTAutoDiscover.h
++++ hardware/MQTTAutoDiscover.h
+@@ -176,7 +176,7 @@ public:
+ void on_message(const struct mosquitto_message *message) override;
+ void on_connect(int rc) override;
+ void on_disconnect(int rc) override;
+- void on_going_down();
++ void on_going_down() override;
+ private:
+ void InsertUpdateSwitch(_tMQTTASensor* pSensor);
+
+diff --git hardware/PanasonicTV.cpp hardware/PanasonicTV.cpp
+index fc57d34..ce20565 100644
+--- hardware/PanasonicTV.cpp
++++ hardware/PanasonicTV.cpp
+@@ -356,18 +356,17 @@ std::string CPanasonicNode::handleWriteAndRead(const std::string& pMessageToSend
+ {
+
+ _log.Debug(DEBUG_HARDWARE, "Panasonic Plugin: (%s) Handling message: '%s'.", m_Name.c_str(), pMessageToSend.c_str());
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_context;
+ // Get a list of endpoints corresponding to the server name.
+- boost::asio::ip::tcp::resolver resolver(io_service);
+- boost::asio::ip::tcp::resolver::query query(m_IP, (m_Port[0] != '-' ? m_Port : m_Port.substr(1)));
+- auto iter = resolver.resolve(query);
++ boost::asio::ip::tcp::resolver resolver(io_context);
++ auto endpoints = resolver.resolve(m_IP, (m_Port[0] != '-' ? m_Port : m_Port.substr(1)));
++ auto iter = endpoints.begin();
+ boost::asio::ip::tcp::endpoint endpoint = *iter;
+- boost::asio::ip::tcp::resolver::iterator end;
+
+ // Try each endpoint until we successfully establish a connection.
+- boost::asio::ip::tcp::socket socket(io_service);
++ boost::asio::ip::tcp::socket socket(io_context);
+ boost::system::error_code error = boost::asio::error::host_not_found;
+- while (error && iter != end)
++ while (error && iter != endpoints.end())
+ {
+ socket.close();
+ if (handleConnect(socket, *iter, error))
+@@ -1060,7 +1059,7 @@ void CPanasonic::ReloadNodes()
+ {
+ UnloadNodes();
+
+- //m_ios.reset(); // in case this is not the first time in
++ //m_ioc.reset(); // in case this is not the first time in
+
+ std::vector<std::vector<std::string> > result;
+ result = m_sql.safe_query("SELECT ID,Name,MacAddress,Timeout FROM WOLNodes WHERE (HardwareID==%d)", m_HwdID);
+@@ -1088,10 +1087,10 @@ void CPanasonic::UnloadNodes()
+ {
+ std::lock_guard<std::mutex> l(m_mutex);
+
+- m_ios.stop(); // stop the service if it is running
++ m_ioc.stop(); // stop the service if it is running
+ sleep_milliseconds(100);
+
+- while (((!m_pNodes.empty()) || (!m_ios.stopped())))
++ while (((!m_pNodes.empty()) || (!m_ioc.stopped())))
+ {
+ for (auto itt = m_pNodes.begin(); itt != m_pNodes.end(); ++itt)
+ {
+diff --git hardware/PanasonicTV.h hardware/PanasonicTV.h
+index b0a94ff..30e1ca1 100644
+--- hardware/PanasonicTV.h
++++ hardware/PanasonicTV.h
+@@ -39,7 +39,7 @@ class CPanasonic : public CDomoticzHardwareBase
+ bool m_bTryIfOff;
+ std::shared_ptr<std::thread> m_thread;
+ std::mutex m_mutex;
+- boost::asio::io_service m_ios;
++ boost::asio::io_context m_ioc;
+
+ friend class CPanasonicNode;
+ };
+diff --git hardware/Pinger.cpp hardware/Pinger.cpp
+index a66c7a1..e070b29 100644
+--- hardware/Pinger.cpp
++++ hardware/Pinger.cpp
+@@ -21,23 +21,23 @@
+ #if BOOST_VERSION >= 107000
+ #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
+ #else
+-#define GET_IO_SERVICE(s) ((s).get_io_service())
++#define GET_IO_SERVICE(s) ((s).get_io_context())
+ #endif
+
+ class pinger
+ : private domoticz::noncopyable
+ {
+ public:
+- pinger(boost::asio::io_service &io_service, const char *destination, const int iPingTimeoutms)
++ pinger(boost::asio::io_context &io_context, const char *destination, const int iPingTimeoutms)
+ : num_replies_(0)
+ , m_PingState(false)
+- , resolver_(io_service)
+- , socket_(io_service, boost::asio::ip::icmp::v4())
+- , timer_(io_service)
++ , resolver_(io_context)
++ , socket_(io_context, boost::asio::ip::icmp::v4())
++ , timer_(io_context)
+ , sequence_number_(0)
+ {
+- boost::asio::ip::icmp::resolver::query query(boost::asio::ip::icmp::v4(), destination, "");
+- destination_ = *resolver_.resolve(query);
++ auto endpoints = resolver_.resolve(boost::asio::ip::icmp::v4(), destination, "");
++ destination_ = endpoints.begin()->endpoint();
+
+ num_tries_ = 1;
+ PingTimeoutms_ = iPingTimeoutms;
+@@ -332,11 +332,11 @@ void CPinger::ReloadNodes()
+ void CPinger::Do_Ping_Worker(const PingNode &Node)
+ {
+ bool bPingOK = false;
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_context;
+ try
+ {
+- pinger p(io_service, Node.IP.c_str(), m_iPingTimeoutms);
+- io_service.run();
++ pinger p(io_context, Node.IP.c_str(), m_iPingTimeoutms);
++ io_context.run();
+ if (p.m_PingState == true)
+ {
+ bPingOK = true;
+diff --git hardware/RFLinkMQTT.h hardware/RFLinkMQTT.h
+index e938328..72433b8 100644
+--- hardware/RFLinkMQTT.h
++++ hardware/RFLinkMQTT.h
+@@ -46,7 +46,7 @@ protected:
+ boost::signals2::connection m_sDeviceReceivedConnection;
+ boost::signals2::connection m_sSwitchSceneConnection;
+ void selectNextIPAdress( void );
+- virtual bool WriteInt(const std::string &sendString); // override;
++ bool WriteInt(const std::string &sendString) override;
+ void Do_Work();
+ virtual void SendHeartbeat();
+ void StopMQTT();
+diff --git hardware/TCPProxy/tcpproxy_server.cpp hardware/TCPProxy/tcpproxy_server.cpp
+index 8aceb0b..d77d4bf 100644
+--- hardware/TCPProxy/tcpproxy_server.cpp
++++ hardware/TCPProxy/tcpproxy_server.cpp
+@@ -18,12 +18,12 @@
+ #if BOOST_VERSION >= 107000
+ #define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
+ #else
+-#define GET_IO_SERVICE(s) ((s).get_io_service())
++#define GET_IO_SERVICE(s) ((s).get_io_context())
+ #endif
+
+ namespace tcp_proxy
+ {
+- bridge::bridge(boost::asio::io_service& ios)
++ bridge::bridge(boost::asio::io_context& ios)
+ : downstream_socket_(ios),
+ upstream_socket_(ios)
+ {
+@@ -44,7 +44,7 @@ namespace tcp_proxy
+ boost::asio::ip::tcp::endpoint end;
+
+
+- boost::asio::io_service &ios= GET_IO_SERVICE(downstream_socket_);
++ boost::asio::io_context &ios= GET_IO_SERVICE(downstream_socket_);
+ boost::asio::ip::tcp::resolver resolver(ios);
+ boost::asio::ip::tcp::resolver::query query(upstream_host, upstream_port, boost::asio::ip::resolver_query_base::numeric_service);
+ auto i = resolver.resolve(query);
+@@ -137,10 +137,10 @@ namespace tcp_proxy
+ }
+ //Acceptor Class
+ acceptor::acceptor(const std::string &local_host, unsigned short local_port, const std::string &upstream_host, const std::string &upstream_port)
+- : io_service_()
++ : io_context_()
+ , m_bDoStop(false)
+ , localhost_address(boost::asio::ip::address_v4::from_string(local_host))
+- , acceptor_(io_service_, boost::asio::ip::tcp::endpoint(localhost_address, local_port))
++ , acceptor_(io_context_, boost::asio::ip::tcp::endpoint(localhost_address, local_port))
+ , upstream_host_(upstream_host)
+ , upstream_port_(upstream_port)
+ {
+@@ -151,7 +151,7 @@ namespace tcp_proxy
+ {
+ try
+ {
+- session_ = std::make_shared<bridge>(io_service_);
++ session_ = std::make_shared<bridge>(io_context_);
+ session_->sDownstreamData.connect([this](auto d, auto l) { OnDownstreamData(d, l); });
+ session_->sUpstreamData.connect([this](auto d, auto l) { OnUpstreamData(d, l); });
+
+@@ -169,11 +169,11 @@ namespace tcp_proxy
+ m_bDoStop=false;
+
+ accept_connections();
+- // The io_service::run() call will block until all asynchronous operations
++ // The io_context::run() call will block until all asynchronous operations
+ // have finished. While the server is running, there is always at least one
+ // asynchronous operation outstanding: the asynchronous accept call waiting
+ // for new incoming connections.
+- io_service_.run();
++ io_context_.run();
+ return true;
+ }
+ bool acceptor::stop()
+@@ -181,14 +181,14 @@ namespace tcp_proxy
+ m_bDoStop=true;
+ // Post a call to the stop function so that server::stop() is safe to call
+ // from any thread.
+- io_service_.post([this] { handle_stop(); });
++ io_context_.post([this] { handle_stop(); });
+ return true;
+ }
+
+ void acceptor::handle_stop()
+ {
+ // The server is stopped by canceling all outstanding asynchronous
+- // operations. Once all operations have finished the io_service::run() call
++ // operations. Once all operations have finished the io_context::run() call
+ // will exit.
+ acceptor_.close();
+ //connection_manager_.stop_all();
+diff --git hardware/TCPProxy/tcpproxy_server.h hardware/TCPProxy/tcpproxy_server.h
+index 3d1a150..148e65f 100644
+--- hardware/TCPProxy/tcpproxy_server.h
++++ hardware/TCPProxy/tcpproxy_server.h
+@@ -10,7 +10,7 @@ namespace tcp_proxy
+ class bridge : public std::enable_shared_from_this<bridge>
+ {
+ public:
+- explicit bridge(boost::asio::io_service& ios);
++ explicit bridge(boost::asio::io_context& ios);
+ boost::asio::ip::tcp::socket& downstream_socket();
+ boost::asio::ip::tcp::socket& upstream_socket();
+
+@@ -52,8 +52,8 @@ namespace tcp_proxy
+ void OnUpstreamData(const unsigned char *pData, size_t Len);
+ void OnDownstreamData(const unsigned char *pData, size_t Len);
+
+- /// The io_service used to perform asynchronous operations.
+- boost::asio::io_service io_service_;
++ /// The io_context used to perform asynchronous operations.
++ boost::asio::io_context io_context_;
+ bool m_bDoStop;
+ boost::asio::ip::address_v4 localhost_address;
+ boost::asio::ip::tcp::acceptor acceptor_;
+diff --git hardware/XiaomiDeviceSupport.h hardware/XiaomiDeviceSupport.h
+index fad7884..4a76d96 100644
+--- hardware/XiaomiDeviceSupport.h
++++ hardware/XiaomiDeviceSupport.h
+@@ -15,6 +15,7 @@
+ class XiaomiDeviceSupport
+ {
+ public:
++ virtual ~XiaomiDeviceSupport() = default;
+ /**
+ * Method to get 'model' corresponding to the ID of the device in case the Gateway API didn't provide it.
+ *
+diff --git hardware/XiaomiGateway.cpp hardware/XiaomiGateway.cpp
+index 66acdc5..fb4387a 100644
+--- hardware/XiaomiGateway.cpp
++++ hardware/XiaomiGateway.cpp
+@@ -538,12 +538,12 @@ bool XiaomiGateway::SendMessageToGateway(const std::string &controlmessage)
+ {
+ std::string message = controlmessage;
+ bool result = true;
+- boost::asio::io_service io_service;
+- boost::asio::ip::udp::socket socket_(io_service, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0));
++ boost::asio::io_context io_context;
++ boost::asio::ip::udp::socket socket_(io_context, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0));
+ stdreplace(message, "@gatewaykey", GetGatewayKey());
+ std::shared_ptr<std::string> message1(new std::string(message));
+ boost::asio::ip::udp::endpoint remote_endpoint_;
+- remote_endpoint_ = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(m_GatewayIp), 9898);
++ remote_endpoint_ = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4(m_GatewayIp), 9898);
+ socket_.send_to(boost::asio::buffer(*message1), remote_endpoint_);
+ sleep_milliseconds(150); // TODO: reduce or remove sleep
+ std::array<char, 512> recv_buffer_;
+@@ -1015,15 +1015,14 @@ bool XiaomiGateway::StopHardware()
+ void XiaomiGateway::Do_Work()
+ {
+ Log(LOG_STATUS, "XiaomiGateway (ID=%d): Worker started...", m_HwdID);
+- boost::asio::io_service io_service;
++ boost::asio::io_context io_context;
+ // Find the local ip address that is similar to the xiaomi gateway
+ try
+ {
+- boost::asio::ip::udp::resolver resolver(io_service);
+- boost::asio::ip::udp::resolver::query query(boost::asio::ip::udp::v4(), m_GatewayIp, "");
+- auto endpoints = resolver.resolve(query);
+- boost::asio::ip::udp::endpoint ep = *endpoints;
+- boost::asio::ip::udp::socket socket(io_service);
++ boost::asio::ip::udp::resolver resolver(io_context);
++ auto endpoints = resolver.resolve(boost::asio::ip::udp::v4(), m_GatewayIp, "");
++ boost::asio::ip::udp::endpoint ep = *endpoints.begin();
++ boost::asio::ip::udp::socket socket(io_context);
+ socket.connect(ep);
+ boost::asio::ip::address addr = socket.local_endpoint().address();
+ std::string compareIp = m_GatewayIp.substr(0, (m_GatewayIp.length() - 3));
+@@ -1073,11 +1072,11 @@ void XiaomiGateway::Do_Work()
+ }
+ }
+
+- XiaomiGateway::xiaomi_udp_server udp_server(io_service, m_HwdID, m_GatewayIp, m_LocalIp, m_ListenPort9898, m_OutputMessage, m_IncludeVoltage, this);
++ XiaomiGateway::xiaomi_udp_server udp_server(io_context, m_HwdID, m_GatewayIp, m_LocalIp, m_ListenPort9898, m_OutputMessage, m_IncludeVoltage, this);
+ boost::thread bt;
+ if (m_ListenPort9898)
+ {
+- bt = boost::thread([p = &io_service] { p->run(); });
++ bt = boost::thread([p = &io_context] { p->run(); });
+ SetThreadName(bt.native_handle(), "XiaomiGatewayIO");
+ }
+
+@@ -1094,7 +1093,7 @@ void XiaomiGateway::Do_Work()
+ // Log(LOG_STATUS, "sec_counter %d", sec_counter);
+ }
+ }
+- io_service.stop();
++ io_context.stop();
+ if (bt.joinable())
+ {
+ bt.join();
+@@ -1178,9 +1177,9 @@ unsigned int XiaomiGateway::GetShortID(const std::string &nodeid)
+ return sID;
+ }
+
+-XiaomiGateway::xiaomi_udp_server::xiaomi_udp_server(boost::asio::io_service &io_service, int m_HwdID, const std::string &gatewayIp, const std::string &localIp, const bool listenPort9898,
++XiaomiGateway::xiaomi_udp_server::xiaomi_udp_server(boost::asio::io_context &io_context, int m_HwdID, const std::string &gatewayIp, const std::string &localIp, const bool listenPort9898,
+ const bool outputMessage, const bool includeVoltage, XiaomiGateway *parent)
+- : socket_(io_service, boost::asio::ip::udp::v4())
++ : socket_(io_context, boost::asio::ip::udp::v4())
+ {
+ m_HardwareID = m_HwdID;
+ m_XiaomiGateway = parent;
+@@ -1196,8 +1195,8 @@ XiaomiGateway::xiaomi_udp_server::xiaomi_udp_server(boost::asio::io_service &io_
+ if (!m_localip.empty())
+ {
+ boost::system::error_code ec;
+- boost::asio::ip::address listen_addr = boost::asio::ip::address::from_string(m_localip, ec);
+- boost::asio::ip::address mcast_addr = boost::asio::ip::address::from_string("224.0.0.50", ec);
++ boost::asio::ip::address listen_addr = boost::asio::ip::make_address_v4(m_localip, ec);
++ boost::asio::ip::address mcast_addr = boost::asio::ip::make_address_v4("224.0.0.50", ec);
+ boost::asio::ip::udp::endpoint listen_endpoint(mcast_addr, 9898);
+
+ socket_.bind(boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 9898));
+@@ -1213,9 +1212,9 @@ XiaomiGateway::xiaomi_udp_server::xiaomi_udp_server(boost::asio::io_service &io_
+ socket_.bind(boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 9898));
+ std::shared_ptr<std::string> message(new std::string(R"({"cmd":"whois"})"));
+ boost::asio::ip::udp::endpoint remote_endpoint;
+- remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string("224.0.0.50"), 4321);
++ remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4("224.0.0.50"), 4321);
+ socket_.send_to(boost::asio::buffer(*message), remote_endpoint);
+- socket_.set_option(boost::asio::ip::multicast::join_group(boost::asio::ip::address::from_string("224.0.0.50")));
++ socket_.set_option(boost::asio::ip::multicast::join_group(boost::asio::ip::make_address_v4("224.0.0.50")));
+ }
+ }
+ catch (const boost::system::system_error &ex)
+@@ -1720,7 +1719,7 @@ void XiaomiGateway::xiaomi_udp_server::handle_receive(const boost::system::error
+ message.append("\"}");
+ std::shared_ptr<std::string> message1(new std::string(message));
+ boost::asio::ip::udp::endpoint remote_endpoint;
+- remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(TrueGateway->GetGatewayIp().c_str()), 9898);
++ remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4(TrueGateway->GetGatewayIp().c_str()), 9898);
+ socket_.send_to(boost::asio::buffer(*message1), remote_endpoint);
+ }
+ }
+@@ -1746,7 +1745,7 @@ void XiaomiGateway::xiaomi_udp_server::handle_receive(const boost::system::error
+ std::string message = R"({"cmd" : "get_id_list"})";
+ std::shared_ptr<std::string> message2(new std::string(message));
+ boost::asio::ip::udp::endpoint remote_endpoint;
+- remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string(TrueGateway->GetGatewayIp().c_str()), 9898);
++ remote_endpoint = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4(TrueGateway->GetGatewayIp().c_str()), 9898);
+ socket_.send_to(boost::asio::buffer(*message2), remote_endpoint);
+ }
+ }
+diff --git hardware/XiaomiGateway.h hardware/XiaomiGateway.h
+index dce4b34..1f552f3 100644
+--- hardware/XiaomiGateway.h
++++ hardware/XiaomiGateway.h
+@@ -100,7 +100,7 @@ class XiaomiGateway : public CDomoticzHardwareBase
+ class xiaomi_udp_server
+ {
+ public:
+- xiaomi_udp_server(boost::asio::io_service &io_service, int m_HwdID, const std::string &gatewayIp, const std::string &localIp, bool listenPort9898, bool outputMessage,
++ xiaomi_udp_server(boost::asio::io_context &io_context, int m_HwdID, const std::string &gatewayIp, const std::string &localIp, bool listenPort9898, bool outputMessage,
+ bool includeVolage, XiaomiGateway *parent);
+ ~xiaomi_udp_server() = default;
+
+diff --git hardware/Yeelight.cpp hardware/Yeelight.cpp
+index cdb7889..e5fe8fc 100644
+--- hardware/Yeelight.cpp
++++ hardware/Yeelight.cpp
+@@ -93,8 +93,8 @@ void Yeelight::Do_Work()
+
+ try
+ {
+- boost::asio::io_service io_service;
+- udp_server server(io_service, m_HwdID);
++ boost::asio::io_context io_context;
++ udp_server server(io_context, m_HwdID);
+ int sec_counter = YEELIGHT_POLL_INTERVAL - 5;
+ while (!IsStopRequested(1000))
+ {
+@@ -105,7 +105,7 @@ void Yeelight::Do_Work()
+ if (sec_counter % 60 == 0) //poll YeeLights every minute
+ {
+ server.start_send();
+- io_service.run();
++ io_context.run();
+ }
+ }
+ }
+@@ -227,12 +227,11 @@ bool Yeelight::WriteToHardware(const char *pdata, const unsigned char length)
+
+ try
+ {
+- boost::asio::io_service io_service;
+- boost::asio::ip::tcp::socket sendSocket(io_service);
+- boost::asio::ip::tcp::resolver resolver(io_service);
+- boost::asio::ip::tcp::resolver::query query(boost::asio::ip::tcp::v4(), szTmp, "55443");
+- auto iterator = resolver.resolve(query);
+- boost::asio::connect(sendSocket, iterator);
++ boost::asio::io_context io_context;
++ boost::asio::ip::tcp::socket sendSocket(io_context);
++ boost::asio::ip::tcp::resolver resolver(io_context);
++ auto endpoints = resolver.resolve(boost::asio::ip::tcp::v4(), szTmp, "55443");
++ boost::asio::connect(sendSocket, endpoints);
+
+ std::string message;
+ std::string message2;
+@@ -404,8 +403,8 @@ bool Yeelight::WriteToHardware(const char *pdata, const unsigned char length)
+ std::array<char, 1024> recv_buffer_;
+ int hardwareId;
+
+-Yeelight::udp_server::udp_server(boost::asio::io_service& io_service, int m_HwdID)
+- : socket_(io_service, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0))
++Yeelight::udp_server::udp_server(boost::asio::io_context& io_context, int m_HwdID)
++ : socket_(io_context, boost::asio::ip::udp::endpoint(boost::asio::ip::udp::v4(), 0))
+ {
+ socket_.set_option(boost::asio::ip::udp::socket::reuse_address(true));
+ socket_.set_option(boost::asio::socket_base::broadcast(true));
+@@ -421,7 +420,7 @@ void Yeelight::udp_server::start_send()
+ //Log(LOG_STATUS, "start_send..................");
+ std::shared_ptr<std::string> message(
+ new std::string(testMessage));
+- remote_endpoint_ = boost::asio::ip::udp::endpoint(boost::asio::ip::address::from_string("239.255.255.250"), 1982);
++ remote_endpoint_ = boost::asio::ip::udp::endpoint(boost::asio::ip::make_address_v4("239.255.255.250"), 1982);
+ socket_.send_to(boost::asio::buffer(*message), remote_endpoint_);
+ sleep_milliseconds(150);
+ start_receive();
+diff --git hardware/Yeelight.h hardware/Yeelight.h
+index fb03c28..3b7b4c3 100644
+--- hardware/Yeelight.h
++++ hardware/Yeelight.h
+@@ -25,7 +25,7 @@ class Yeelight : public CDomoticzHardwareBase
+ class udp_server
+ {
+ public:
+- udp_server(boost::asio::io_service &io_service, int m_HwdID);
++ udp_server(boost::asio::io_context &io_context, int m_HwdID);
+ boost::asio::ip::udp::socket socket_;
+ boost::asio::ip::udp::endpoint remote_endpoint_;
+ void start_send();
+diff --git hardware/plugins/PluginManager.cpp hardware/plugins/PluginManager.cpp
+index 2813112..423edbb 100644
+--- hardware/plugins/PluginManager.cpp
++++ hardware/plugins/PluginManager.cpp
+@@ -64,7 +64,7 @@ namespace Plugins {
+ // PyMODINIT_FUNC PyInit_DomoticzEvents(void);
+
+ std::mutex PluginMutex; // controls accessto the message queue and m_pPlugins map
+- boost::asio::io_service ios;
++ boost::asio::io_context ios;
+
+ std::map<int, CDomoticzHardwareBase*> CPluginSystem::m_pPlugins;
+ std::map<std::string, std::string> CPluginSystem::m_PluginXml;
+@@ -315,7 +315,7 @@ namespace Plugins {
+ // Create initial IO Service thread
+ ios.restart();
+ // Create some work to keep IO Service alive
+- auto work = boost::asio::io_service::work(ios);
++ auto work = boost::asio::make_work_guard(ios);
+ boost::thread_group BoostThreads;
+ for (int i = 0; i < 1; i++)
+ {
+diff --git hardware/plugins/PluginTransports.cpp hardware/plugins/PluginTransports.cpp
+index 52d14e7..f7ace0f 100644
+--- hardware/plugins/PluginTransports.cpp
++++ hardware/plugins/PluginTransports.cpp
+@@ -116,15 +116,14 @@ namespace Plugins {
+ m_bConnected = false;
+ m_Socket = new boost::asio::ip::tcp::socket(ios);
+
+- boost::system::error_code ec;
+- boost::asio::ip::tcp::resolver::query query(m_IP, m_Port);
+- auto iter = m_Resolver.resolve(query);
+- boost::asio::ip::tcp::endpoint endpoint = *iter;
+-
+ //
+ // Async resolve/connect based on http://www.boost.org/doc/libs/1_45_0/doc/html/boost_asio/example/http/client/async_client.cpp
+ //
+- m_Resolver.async_resolve(query, [this](auto &&err, auto end) { handleAsyncResolve(err, end); });
++ m_Resolver.async_resolve(m_IP, m_Port,
++ [this](auto &&err, auto endpoints) {
++ handleAsyncResolve(err, endpoints);
++ }
++ );
+ }
+ }
+ catch (std::exception& e)
+@@ -139,15 +138,14 @@ namespace Plugins {
+ return true;
+ }
+
+- void CPluginTransportTCP::handleAsyncResolve(const boost::system::error_code & err, boost::asio::ip::tcp::resolver::iterator endpoint_iterator)
++ void CPluginTransportTCP::handleAsyncResolve(const boost::system::error_code & err, boost::asio::ip::tcp::resolver::results_type endpoints)
+ {
+ CPlugin* pPlugin = ((CConnection*)m_pConnection)->pPlugin;
+ AccessPython Guard(pPlugin, "CPluginTransportTCP::handleAsyncResolve");
+
+ if (!err)
+ {
+- boost::asio::ip::tcp::endpoint endpoint = *endpoint_iterator;
+- m_Socket->async_connect(endpoint, [this, endpoint_iterator](auto &&err) mutable { handleAsyncConnect(err, ++endpoint_iterator); });
++ boost::asio::async_connect(*m_Socket, endpoints, [this](auto &&err, const boost::asio::ip::tcp::endpoint &endpoint) mutable { handleAsyncConnect(err, endpoint); });
+ }
+ else
+ {
+@@ -169,7 +167,7 @@ namespace Plugins {
+ }
+ }
+
+- void CPluginTransportTCP::handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::resolver::iterator &endpoint_iterator)
++ void CPluginTransportTCP::handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::endpoint &endpoint)
+ {
+ CPlugin* pPlugin = ((CConnection*)m_pConnection)->pPlugin;
+ AccessPython Guard(pPlugin, "CPluginTransportTCP::handleAsyncResolve");
+@@ -481,7 +479,7 @@ namespace Plugins {
+ }
+ };
+
+- void CPluginTransportTCPSecure::handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::resolver::iterator &endpoint_iterator)
++ void CPluginTransportTCPSecure::handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::endpoint &endpoint)
+ {
+ CPlugin* pPlugin = ((CConnection*)m_pConnection)->pPlugin;
+ if (!pPlugin) return;
+@@ -498,7 +496,7 @@ namespace Plugins {
+ SSL_set_tlsext_host_name(m_TLSSock->native_handle(), m_IP.c_str()); // Enable SNI
+
+ m_TLSSock->set_verify_mode(boost::asio::ssl::verify_none);
+- m_TLSSock->set_verify_callback(boost::asio::ssl::rfc2818_verification(m_IP));
++ m_TLSSock->set_verify_callback(boost::asio::ssl::host_name_verification(m_IP));
+ // m_TLSSock->set_verify_callback([this](auto v, auto &c){ VerifyCertificate(v, c);});
+ try
+ {
+@@ -648,7 +646,7 @@ namespace Plugins {
+ // Hanlde multicast
+ if (((m_IP.substr(0, 4) >= "224.") && (m_IP.substr(0, 4) <= "239.")) || (m_IP.substr(0, 4) == "255."))
+ {
+- m_Socket->set_option(boost::asio::ip::multicast::join_group(boost::asio::ip::address::from_string(m_IP.c_str())), ec);
++ m_Socket->set_option(boost::asio::ip::multicast::join_group(boost::asio::ip::make_address_v4(m_IP.c_str())), ec);
+ m_Socket->set_option(boost::asio::ip::multicast::hops(2), ec);
+ }
+ }
+@@ -764,7 +762,7 @@ namespace Plugins {
+ }
+ else
+ {
+- boost::asio::ip::udp::endpoint destination(boost::asio::ip::address::from_string(m_IP.c_str()), atoi(m_Port.c_str()));
++ boost::asio::ip::udp::endpoint destination(boost::asio::ip::make_address_v4(m_IP.c_str()), atoi(m_Port.c_str()));
+ size_t bytes_transferred = m_Socket->send_to(boost::asio::buffer(pMessage, pMessage.size()), destination);
+ }
+ }
+@@ -825,12 +823,14 @@ namespace Plugins {
+ }
+ };
+
+- void CPluginTransportICMP::handleAsyncResolve(const boost::system::error_code &ec, const boost::asio::ip::icmp::resolver::iterator &endpoint_iterator)
++ void CPluginTransportICMP::handleAsyncResolve(const boost::system::error_code &ec, boost::asio::ip::icmp::resolver::results_type endpoints)
+ {
+ if (!ec)
+ {
++ m_Endpoint = endpoints.begin()->endpoint();
++ m_IP = m_Endpoint.address().to_string();
++
+ m_bConnected = true;
+- m_IP = endpoint_iterator->endpoint().address().to_string();
+
+ // Listen will fail (10022 - bad parameter) unless something has been sent(?)
+ std::string body("ping");
+@@ -857,15 +857,11 @@ namespace Plugins {
+ m_bConnecting = true;
+ m_Socket = new boost::asio::ip::icmp::socket(ios, boost::asio::ip::icmp::v4());
+
+- boost::system::error_code ec;
+- boost::asio::ip::icmp::resolver::query query(boost::asio::ip::icmp::v4(), m_IP, "");
+- auto iter = m_Resolver.resolve(query);
+- m_Endpoint = *iter;
+-
+- //
+- // Async resolve/connect based on http://www.boost.org/doc/libs/1_51_0/doc/html/boost_asio/example/icmp/ping.cpp
+- //
+- m_Resolver.async_resolve(query, [this](auto &&err, auto i) { handleAsyncResolve(err, i); });
++ m_Resolver.async_resolve(boost::asio::ip::icmp::v4(), m_IP, "",
++ [this](auto &&err, auto endpoints) {
++ handleAsyncResolve(err, endpoints);
++ }
++ );
+ }
+ else
+ {
+diff --git hardware/plugins/PluginTransports.h hardware/plugins/PluginTransports.h
+index c1cc1e3..79d5725 100644
+--- hardware/plugins/PluginTransports.h
++++ hardware/plugins/PluginTransports.h
+@@ -6,7 +6,7 @@
+
+ namespace Plugins {
+
+- extern boost::asio::io_service ios;
++ extern boost::asio::io_context ios;
+
+ class CPluginTransport
+ {
+@@ -85,8 +85,8 @@ namespace Plugins {
+ , m_Socket(nullptr){};
+ bool handleConnect() override;
+ bool handleListen() override;
+- virtual void handleAsyncResolve(const boost::system::error_code &err, boost::asio::ip::tcp::resolver::iterator endpoint_iterator);
+- virtual void handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::resolver::iterator &endpoint_iterator);
++ virtual void handleAsyncResolve(const boost::system::error_code &err, boost::asio::ip::tcp::resolver::results_type endpoints);
++ virtual void handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::endpoint &endpoint);
+ virtual void handleAsyncAccept(boost::asio::ip::tcp::socket *pSocket, const boost::system::error_code &error);
+ void handleRead(const boost::system::error_code &e, std::size_t bytes_transferred) override;
+ void handleWrite(const std::vector<byte> &pMessage) override;
+@@ -111,7 +111,7 @@ namespace Plugins {
+ : CPluginTransportTCP(HwdID, pConnection, Address, Port)
+ , m_Context(nullptr)
+ , m_TLSSock(nullptr){};
+- void handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::resolver::iterator &endpoint_iterator) override;
++ void handleAsyncConnect(const boost::system::error_code &err, const boost::asio::ip::tcp::endpoint &endpoint) override;
+ void handleRead(const boost::system::error_code &e, std::size_t bytes_transferred) override;
+ void handleWrite(const std::vector<byte> &pMessage) override;
+ ~CPluginTransportTCPSecure() override;
+@@ -151,7 +151,7 @@ namespace Plugins {
+ , m_Socket(nullptr)
+ , m_Timer(nullptr)
+ , m_SequenceNo(-1){};
+- void handleAsyncResolve(const boost::system::error_code &err, const boost::asio::ip::icmp::resolver::iterator &endpoint_iterator);
++ void handleAsyncResolve(const boost::system::error_code &err, boost::asio::ip::icmp::resolver::results_type endpoints);
+ bool handleListen() override;
+ void handleTimeout(const boost::system::error_code &) override;
+ void handleRead(const boost::system::error_code &e, std::size_t bytes_transferred) override;
+diff --git main/WebServerCmds.cpp main/WebServerCmds.cpp
+index 7d4a9f2..3586373 100644
+--- main/WebServerCmds.cpp
++++ main/WebServerCmds.cpp
+@@ -1632,7 +1632,7 @@ namespace http
+ ExtraHeaders.push_back("App_Revision: " + std::to_string(iAppRevision));
+ ExtraHeaders.push_back("System_Name: " + systemname);
+ ExtraHeaders.push_back("Machine: " + machine);
+- ExtraHeaders.push_back("Type: " + (!bIsBetaChannel) ? "Stable" : "Beta");
++ ExtraHeaders.push_back("Type: " + std::string(!bIsBetaChannel ? "Stable" : "Beta"));
+
+ if (!HTTPClient::GET(szHistoryURL, ExtraHeaders, historyfile))
+ {
+diff --git main/mainworker.cpp main/mainworker.cpp
+index b5027eb..b8f8dc7 100644
+--- main/mainworker.cpp
++++ main/mainworker.cpp
+@@ -1318,7 +1318,7 @@ bool MainWorker::IsUpdateAvailable(const bool bIsForced)
+ ExtraHeaders.push_back("App_Revision: " + std::to_string(iAppRevision));
+ ExtraHeaders.push_back("System_Name: " + m_szSystemName);
+ ExtraHeaders.push_back("Machine: " + machine);
+- ExtraHeaders.push_back("Type: " + (!bIsBetaChannel) ? "Stable" : "Beta");
++ ExtraHeaders.push_back("Type: " + std::string(!bIsBetaChannel ? "Stable" : "Beta"));
+
+ if (!HTTPClient::GET(szURL, ExtraHeaders, revfile))
+ return false;
+diff --git plugins/examples/Pinger.py plugins/examples/Pinger.py
+index 6b54559..c7a776d 100644
+--- plugins/examples/Pinger.py
++++ plugins/examples/Pinger.py
+@@ -3,7 +3,7 @@
+ # Author: Dnpwwo, 2017 - 2018
+ #
+ """
+-<plugin key="ICMP" name="Pinger (ICMP)" author="dnpwwo" version="3.1.4">
++<plugin key="ICMP" name="Pinger (ICMP)" author="dnpwwo" version="3.1.5">
+ <description>
+ ICMP Pinger Plugin.<br/><br/>
+ Specify comma delimted addresses (IP or DNS names) of devices that are to be pinged.<br/>
+@@ -144,8 +144,9 @@ class BasePlugin:
+ for Device in Devices:
+ if (("Name" in Devices[Device].Options) and (Devices[Device].Options["Name"] == Connection.Name)):
+ UpdateDevice(Device, 0, "Off", TimedOut)
+- self.icmpConn.Close()
+- self.icmpConn = None
++ if (self.icmpConn != None):
++ self.icmpConn.Close()
++ self.icmpConn = None
+
+ def onHeartbeat(self):
+ Domoticz.Debug("Heartbeating...")
+diff --git push/MQTTPush.h push/MQTTPush.h
+index 0773b43..d9f9332 100644
+--- push/MQTTPush.h
++++ push/MQTTPush.h
+@@ -14,7 +14,7 @@ public:
+ void on_message(const struct mosquitto_message* message) override;
+ void on_connect(int rc) override;
+ void on_disconnect(int rc) override;
+- void on_going_down();
++ void on_going_down() override;
+ private:
+ struct _tPushItem
+ {
+diff --git tcpserver/TCPClient.cpp tcpserver/TCPClient.cpp
+index d55da10..3eee093 100644
+--- tcpserver/TCPClient.cpp
++++ tcpserver/TCPClient.cpp
+@@ -19,7 +19,7 @@ namespace tcp {
+ delete socket_;
+ }
+
+- CTCPClient::CTCPClient(boost::asio::io_service& ios, CTCPServerIntBase* pManager)
++ CTCPClient::CTCPClient(boost::asio::io_context& ios, CTCPServerIntBase* pManager)
+ : CTCPClientBase(pManager)
+ {
+ socket_ = new boost::asio::ip::tcp::socket(ios);
+diff --git tcpserver/TCPClient.h tcpserver/TCPClient.h
+index df4350d..e7a882b 100644
+--- tcpserver/TCPClient.h
++++ tcpserver/TCPClient.h
+@@ -38,7 +38,7 @@ class CTCPClient : public CTCPClientBase,
+ public std::enable_shared_from_this<CTCPClient>
+ {
+ public:
+- CTCPClient(boost::asio::io_service& ios, CTCPServerIntBase *pManager);
++ CTCPClient(boost::asio::io_context& ios, CTCPServerIntBase *pManager);
+ ~CTCPClient() = default;
+ void start() override;
+ void stop() override;
+diff --git tcpserver/TCPServer.cpp tcpserver/TCPServer.cpp
+index 91fdc7e..57f8709 100644
+--- tcpserver/TCPServer.cpp
++++ tcpserver/TCPServer.cpp
+@@ -18,14 +18,14 @@ namespace tcp {
+
+ CTCPServerInt::CTCPServerInt(const std::string& address, const std::string& port, CTCPServer* pRoot) :
+ CTCPServerIntBase(pRoot),
+- io_service_(),
+- acceptor_(io_service_)
++ io_context_(),
++ acceptor_(io_context_)
+ {
+ // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
+- boost::asio::ip::tcp::resolver resolver(io_service_);
+- boost::asio::ip::tcp::resolver::query query(address, port);
+- boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+- acceptor_.open(endpoint.protocol());
++ boost::asio::ip::tcp::resolver resolver(io_context_);
++ boost::asio::ip::basic_resolver<boost::asio::ip::tcp>::results_type endpoints = resolver.resolve(address, port);
++ auto endpoint = *endpoints.begin();
++ acceptor_.open(endpoint.endpoint().protocol());
+ acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+ // bind to both ipv6 and ipv4 sockets for the "::" address only
+ if (address == "::")
+@@ -35,7 +35,7 @@ namespace tcp {
+ acceptor_.bind(endpoint);
+ acceptor_.listen();
+
+- new_connection_ = std::make_shared<CTCPClient>(io_service_, this);
++ new_connection_ = std::make_shared<CTCPClient>(io_context_, this);
+ if (new_connection_ == nullptr)
+ {
+ _log.Log(LOG_ERROR, "Error creating new client!");
+@@ -47,24 +47,24 @@ namespace tcp {
+
+ void CTCPServerInt::start()
+ {
+- // The io_service::run() call will block until all asynchronous operations
++ // The io_context::run() call will block until all asynchronous operations
+ // have finished. While the server is running, there is always at least one
+ // asynchronous operation outstanding: the asynchronous accept call waiting
+ // for new incoming connections.
+- io_service_.run();
++ io_context_.run();
+ }
+
+ void CTCPServerInt::stop()
+ {
+ // Post a call to the stop function so that server::stop() is safe to call
+ // from any thread.
+- io_service_.post([this] { handle_stop(); });
++ boost::asio::post([this] { handle_stop(); });
+ }
+
+ void CTCPServerInt::handle_stop()
+ {
+ // The server is stopped by cancelling all outstanding asynchronous
+- // operations. Once all operations have finished the io_service::run() call
++ // operations. Once all operations have finished the io_context::run() call
+ // will exit.
+ acceptor_.close();
+ stopAllClients();
+@@ -88,7 +88,7 @@ namespace tcp {
+ connections_.insert(new_connection_);
+ new_connection_->start();
+
+- new_connection_.reset(new CTCPClient(io_service_, this));
++ new_connection_.reset(new CTCPClient(io_context_, this));
+
+ acceptor_.async_accept(*(new_connection_->socket()), [this](auto&& err) { handleAccept(err); });
+ }
+diff --git tcpserver/TCPServer.h tcpserver/TCPServer.h
+index ca611b1..17284ca 100644
+--- tcpserver/TCPServer.h
++++ tcpserver/TCPServer.h
+@@ -70,8 +70,8 @@ private:
+ /// Handle a request to stop the server.
+ void handle_stop();
+
+- /// The io_service used to perform asynchronous operations.
+- boost::asio::io_service io_service_;
++ /// The io_context used to perform asynchronous operations.
++ boost::asio::io_context io_context_;
+
+ boost::asio::ip::tcp::acceptor acceptor_;
+
+diff --git webserver/cWebem.cpp webserver/cWebem.cpp
+index 57d9683..c0d292d 100644
+--- webserver/cWebem.cpp
++++ webserver/cWebem.cpp
+@@ -47,13 +47,13 @@ namespace http {
+ , myRequestHandler(doc_root, this)
+ // Rene, make sure we initialize m_sessions first, before starting a server
+ , myServer(server_factory::create(settings, myRequestHandler))
+- , m_io_service()
+- , m_session_clean_timer(m_io_service, boost::posix_time::minutes(1))
++ , m_io_context()
++ , m_session_clean_timer(m_io_context, boost::posix_time::minutes(1))
+ {
+ // associate handler to timer and schedule the first iteration
+ m_session_clean_timer.async_wait([this](auto &&) { CleanSessions(); });
+- m_io_service_thread = std::make_shared<std::thread>([p = &m_io_service] { p->run(); });
+- SetThreadName(m_io_service_thread->native_handle(), "Webem_ssncleaner");
++ m_io_context_thread = std::make_shared<std::thread>([p = &m_io_context] { p->run(); });
++ SetThreadName(m_io_context_thread->native_handle(), "Webem_ssncleaner");
+ }
+
+ cWebem::~cWebem()
+@@ -93,14 +93,14 @@ namespace http {
+ // Stop session cleaner
+ try
+ {
+- if (!m_io_service.stopped())
++ if (!m_io_context.stopped())
+ {
+- m_io_service.stop();
++ m_io_context.stop();
+ }
+- if (m_io_service_thread)
++ if (m_io_context_thread)
+ {
+- m_io_service_thread->join();
+- m_io_service_thread.reset();
++ m_io_context_thread->join();
++ m_io_context_thread.reset();
+ }
+ }
+ catch (...)
+diff --git webserver/cWebem.h webserver/cWebem.h
+index 6e3b899..7905c45 100644
+--- webserver/cWebem.h
++++ webserver/cWebem.h
+@@ -259,9 +259,9 @@ namespace http
+ std::string m_webRoot;
+ /// sessions management
+ std::mutex m_sessionsMutex;
+- boost::asio::io_service m_io_service;
++ boost::asio::io_context m_io_context;
+ boost::asio::deadline_timer m_session_clean_timer;
+- std::shared_ptr<std::thread> m_io_service_thread;
++ std::shared_ptr<std::thread> m_io_context_thread;
+ };
+
+ } // namespace server
+diff --git webserver/connection.cpp webserver/connection.cpp
+index 40f9788..3a70924 100644
+--- webserver/connection.cpp
++++ webserver/connection.cpp
+@@ -22,13 +22,13 @@ namespace http {
+ extern time_t last_write_time(const std::string& path);
+
+ // this is the constructor for plain connections
+- connection::connection(boost::asio::io_service &io_service, connection_manager &manager, request_handler &handler, int read_timeout)
++ connection::connection(boost::asio::io_context &io_context, connection_manager &manager, request_handler &handler, int read_timeout)
+ : send_buffer_(nullptr)
+ , read_timeout_(read_timeout)
+- , read_timer_(io_service, boost::posix_time::seconds(read_timeout))
++ , read_timer_(io_context, boost::posix_time::seconds(read_timeout))
+ , default_abandoned_timeout_(20 * 60)
+ // 20mn before stopping abandoned connection
+- , abandoned_timer_(io_service, boost::posix_time::seconds(default_abandoned_timeout_))
++ , abandoned_timer_(io_context, boost::posix_time::seconds(default_abandoned_timeout_))
+ , connection_manager_(manager)
+ , request_handler_(handler)
+ , status_(INITIALIZING)
+@@ -39,18 +39,18 @@ namespace http {
+ keepalive_ = false;
+ write_in_progress = false;
+ connection_type = ConnectionType::connection_http;
+- socket_ = std::make_unique<boost::asio::ip::tcp::socket>(io_service);
++ socket_ = std::make_unique<boost::asio::ip::tcp::socket>(io_context);
+ }
+
+ #ifdef WWW_ENABLE_SSL
+ // this is the constructor for secure connections
+- connection::connection(boost::asio::io_service &io_service, connection_manager &manager, request_handler &handler, int read_timeout, boost::asio::ssl::context &context)
++ connection::connection(boost::asio::io_context &io_context, connection_manager &manager, request_handler &handler, int read_timeout, boost::asio::ssl::context &context)
+ : send_buffer_(nullptr)
+ , read_timeout_(read_timeout)
+- , read_timer_(io_service, boost::posix_time::seconds(read_timeout))
++ , read_timer_(io_context, boost::posix_time::seconds(read_timeout))
+ , default_abandoned_timeout_(20 * 60)
+ // 20mn before stopping abandoned connection
+- , abandoned_timer_(io_service, boost::posix_time::seconds(default_abandoned_timeout_))
++ , abandoned_timer_(io_context, boost::posix_time::seconds(default_abandoned_timeout_))
+ , connection_manager_(manager)
+ , request_handler_(handler)
+ , status_(INITIALIZING)
+@@ -62,7 +62,7 @@ namespace http {
+ write_in_progress = false;
+ connection_type = ConnectionType::connection_http;
+ socket_ = nullptr;
+- sslsocket_ = std::make_unique<ssl_socket>(io_service, context);
++ sslsocket_ = std::make_unique<ssl_socket>(io_context, context);
+ }
+ #endif
+
+@@ -152,9 +152,9 @@ namespace http {
+ if (error != boost::asio::error::operation_aborted) {
+ switch (connection_type) {
+ case ConnectionType::connection_http:
+- // Timers should be cancelled before stopping to remove tasks from the io_service.
+- // The io_service will stop naturally when every tasks are removed.
+- // If timers are not cancelled, the exception ERROR_ABANDONED_WAIT_0 is thrown up to the io_service::run() caller.
++ // Timers should be cancelled before stopping to remove tasks from the io_context.
++ // The io_context will stop naturally when every tasks are removed.
++ // If timers are not cancelled, the exception ERROR_ABANDONED_WAIT_0 is thrown up to the io_context::run() caller.
+ cancel_abandoned_timeout();
+ cancel_read_timeout();
+
+@@ -372,7 +372,7 @@ namespace http {
+ switch (connection_type)
+ {
+ case ConnectionType::connection_http:
+- begin = boost::asio::buffer_cast<const char*>(_buf.data());
++ begin = static_cast<const char*>(_buf.data().data());
+ try
+ {
+ request_parser_.reset();
+@@ -404,7 +404,7 @@ namespace http {
+ newt = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
+ }
+
+- size_t sizeread = begin - boost::asio::buffer_cast<const char*>(_buf.data());
++ size_t sizeread = begin - static_cast<const char*>(_buf.data().data());
+ _buf.consume(sizeread);
+ reply_.reset();
+ const char* pConnection = request_.get_req_header(&request_, "Connection");
+@@ -520,7 +520,7 @@ namespace http {
+ break;
+ case ConnectionType::connection_websocket:
+ case ConnectionType::connection_websocket_closing:
+- begin = boost::asio::buffer_cast<const char*>(_buf.data());
++ begin = static_cast<const char*>(_buf.data().data());
+ result = websocket_parser.parse((const unsigned char*)begin, _buf.size(), bytes_consumed, keepalive_);
+ _buf.consume(bytes_consumed);
+ if (result) {
+diff --git webserver/connection.hpp webserver/connection.hpp
+index ce452b5..c1a82c5 100644
+--- webserver/connection.hpp
++++ webserver/connection.hpp
+@@ -43,11 +43,11 @@ namespace http {
+ std::string host_local_endpoint_port_;
+ std::string host_last_request_uri_;
+ };
+- /// Construct a connection with the given io_service.
+- explicit connection(boost::asio::io_service& io_service,
++ /// Construct a connection with the given io_context.
++ explicit connection(boost::asio::io_context& io_context,
+ connection_manager& manager, request_handler& handler, int timeout);
+ #ifdef WWW_ENABLE_SSL
+- explicit connection(boost::asio::io_service& io_service,
++ explicit connection(boost::asio::io_context& io_context,
+ connection_manager& manager, request_handler& handler, int timeout, boost::asio::ssl::context& context);
+ #endif
+ ~connection() = default;
+diff --git webserver/server.cpp webserver/server.cpp
+index da15887..8bdfc13 100644
+--- webserver/server.cpp
++++ webserver/server.cpp
+@@ -13,15 +13,15 @@ namespace http {
+ namespace server {
+
+ server_base::server_base(const server_settings &settings, request_handler &user_request_handler)
+- : io_service_()
+- , acceptor_(io_service_)
++ : io_context_()
++ , acceptor_(io_context_)
+ , request_handler_(user_request_handler)
+ , settings_(settings)
+ , timeout_(20)
+ , // default read timeout in seconds
+ is_running(false)
+ , is_stop_complete(false)
+- , m_heartbeat_timer(io_service_)
++ , m_heartbeat_timer(io_context_)
+ {
+ if (!settings.is_enabled())
+ {
+@@ -39,10 +39,10 @@ namespace server {
+ }
+
+ // Open the acceptor with the option to reuse the address (i.e. SO_REUSEADDR).
+- boost::asio::ip::tcp::resolver resolver(io_service_);
+- boost::asio::ip::tcp::resolver::query query(settings_.listening_address, settings_.listening_port);
+- boost::asio::ip::tcp::endpoint endpoint = *resolver.resolve(query);
+- acceptor_.open(endpoint.protocol());
++ boost::asio::ip::tcp::resolver resolver(io_context_);
++ boost::asio::ip::basic_resolver<boost::asio::ip::tcp>::results_type endpoints = resolver.resolve(settings_.listening_address, settings_.listening_port);
++ auto endpoint = *endpoints.begin();
++ acceptor_.open(endpoint.endpoint().protocol());
+ acceptor_.set_option(boost::asio::ip::tcp::acceptor::reuse_address(true));
+ // bind to both ipv6 and ipv4 sockets for the "::" address only
+ if (settings_.listening_address == "::")
+@@ -59,28 +59,28 @@ namespace server {
+ }
+
+ void server_base::run() {
+- // The io_service::run() call will block until all asynchronous operations
++ // The io_context::run() call will block until all asynchronous operations
+ // have finished. While the server is running, there is always at least one
+ // asynchronous operation outstanding: the asynchronous accept call waiting
+ // for new incoming connections.
+ try {
+ is_running = true;
+ heart_beat(boost::system::error_code());
+- io_service_.run();
++ io_context_.run();
+ is_running = false;
+ } catch (std::exception& e) {
+ _log.Log(LOG_ERROR, "[web:%s] exception occurred : '%s' (need to run again)", settings_.listening_port.c_str(), e.what());
+ is_running = false;
+ // Note: if acceptor is up everything is OK, we can call run() again
+ // but if the exception has broken the acceptor we cannot stop/start it and the next run() will exit immediatly.
+- io_service_.reset(); // this call is needed before calling run() again
++ io_context_.restart(); // this call is needed before calling run() again
+ throw;
+ } catch (...) {
+ _log.Log(LOG_ERROR, "[web:%s] unknown exception occurred (need to run again)", settings_.listening_port.c_str());
+ is_running = false;
+ // Note: if acceptor is up everything is OK, we can call run() again
+ // but if the exception has broken the acceptor we cannot stop/start it and the next run() will exit immediatly.
+- io_service_.reset(); // this call is needed before calling run() again
++ io_context_.restart(); // this call is needed before calling run() again
+ throw;
+ }
+ }
+@@ -89,12 +89,12 @@ void server_base::run() {
+ void server_base::stop() {
+ if (is_running) {
+ // Post a call to the stop function so that server_base::stop() is safe to call from any thread.
+- // Rene, set is_running to false, because the following is an io_service call, which makes is_running
++ // Rene, set is_running to false, because the following is an io_context call, which makes is_running
+ // never set to false whilst in the call itself
+ is_running = false;
+- io_service_.post([this] { handle_stop(); });
++ boost::asio::post(io_context_, [this] { handle_stop(); });
+ } else {
+- // if io_service is not running then the post call will not be performed
++ // if io_context is not running then the post call will not be performed
+ handle_stop();
+ }
+
+@@ -112,7 +112,7 @@ void server_base::stop() {
+ }
+ sleep_milliseconds(500);
+ }
+- io_service_.stop();
++ io_context_.stop();
+
+ // Deregister heartbeat
+ m_mainworker.HeartbeatRemove(std::string("WebServer:") + settings_.listening_port);
+@@ -136,7 +136,7 @@ void server_base::heart_beat(const boost::system::error_code& error)
+ m_mainworker.HeartbeatUpdate(std::string("WebServer:") + settings_.listening_port);
+
+ // Schedule next heartbeat
+- m_heartbeat_timer.expires_from_now(std::chrono::seconds(4));
++ m_heartbeat_timer.expires_after(std::chrono::seconds(4));
+ m_heartbeat_timer.async_wait([this](auto &&err) { heart_beat(err); });
+ }
+ }
+@@ -148,7 +148,7 @@ server::server(const server_settings &settings, request_handler &user_request_ha
+ }
+
+ void server::init_connection() {
+- new_connection_.reset(new connection(io_service_, connection_manager_, request_handler_, timeout_));
++ new_connection_.reset(new connection(io_context_, connection_manager_, request_handler_, timeout_));
+ }
+
+ /**
+@@ -157,7 +157,7 @@ void server::init_connection() {
+ void server::handle_accept(const boost::system::error_code& e) {
+ if (!e) {
+ connection_manager_.start(new_connection_);
+- new_connection_.reset(new connection(io_service_,
++ new_connection_.reset(new connection(io_context_,
+ connection_manager_, request_handler_, timeout_));
+ // listen for a subsequent request
+ acceptor_.async_accept(new_connection_->socket(), [this](auto &&err) { handle_accept(err); });
+@@ -267,7 +267,7 @@ void ssl_server::init_connection() {
+ } else {
+ _log.Log(LOG_ERROR, "[web:%s] missing SSL DH parameters file %s!", settings_.listening_port.c_str(), settings_.tmp_dh_file_path.c_str());
+ }
+- new_connection_.reset(new connection(io_service_, connection_manager_, request_handler_, timeout_, context_));
++ new_connection_.reset(new connection(io_context_, connection_manager_, request_handler_, timeout_, context_));
+ }
+
+ void ssl_server::reinit_connection()
+@@ -305,7 +305,7 @@ void ssl_server::reinit_connection()
+ _log.Log(LOG_ERROR, "[web:%s] missing SSL DH parameters from file %s", settings_.listening_port.c_str(), settings_.tmp_dh_file_path.c_str());
+ }
+ }
+- new_connection_.reset(new connection(io_service_, connection_manager_, request_handler_, timeout_, context_));
++ new_connection_.reset(new connection(io_context_, connection_manager_, request_handler_, timeout_, context_));
+ }
+
+ /**
+diff --git webserver/server.hpp webserver/server.hpp
+index f9e71c5..bd7132a 100644
+--- webserver/server.hpp
++++ webserver/server.hpp
+@@ -31,7 +31,7 @@ namespace http
+ explicit server_base(const server_settings &settings, request_handler &user_request_handler);
+ virtual ~server_base() = default;
+
+- /// Run the server's io_service loop.
++ /// Run the server's io_context loop.
+ void run();
+
+ /// Stop the server.
+@@ -46,8 +46,8 @@ namespace http
+ protected:
+ void init(const init_connectionhandler_func &init_connection_handler, accept_handler_func accept_handler);
+
+- /// The io_service used to perform asynchronous operations.
+- boost::asio::io_service io_service_;
++ /// The io_context used to perform asynchronous operations.
++ boost::asio::io_context io_context_;
+
+ /// Acceptor used to listen for incoming connections.
+ boost::asio::ip::tcp::acceptor acceptor_;
diff --git a/www/dooble/Makefile b/www/dooble/Makefile
index 6f62bd209ab6..5d55648441e1 100644
--- a/www/dooble/Makefile
+++ b/www/dooble/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dooble
-DISTVERSION= 2025.04.27
+DISTVERSION= 2025.05.10
CATEGORIES= www
MAINTAINER= eric@camachat.org
@@ -14,7 +14,7 @@ USES= compiler:c++17-lang desktop-file-utils gl gmake qmake qt:6 ssl \
USE_GITHUB= yes
GH_ACCOUNT= textbrowser
GH_TUPLE= textbrowser:dooble-dictionaries:0f1e715:dictionaries
-#textbrowser:dooble:${PORTVERSION}:DEFAULT
+#textbrowser:dooble:${DISTVERSION}:DEFAULT
USE_GL= opengl
USE_QT= base charts declarative positioning sqldriver-sqlite:run \
webchannel webengine
diff --git a/www/dooble/distinfo b/www/dooble/distinfo
index a1a114f0288b..09504ea3e85b 100644
--- a/www/dooble/distinfo
+++ b/www/dooble/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745801937
-SHA256 (textbrowser-dooble-2025.04.27_GH0.tar.gz) = 7c683ae0a5c3b31a10a64da8c222f59e81d32c2082437928e1bbf97418fa6d1e
-SIZE (textbrowser-dooble-2025.04.27_GH0.tar.gz) = 6503615
+TIMESTAMP = 1746933413
+SHA256 (textbrowser-dooble-2025.05.10_GH0.tar.gz) = f217358f98a03f7ae0f32e33a1c70755827948befc417d5c490b276549f733cd
+SIZE (textbrowser-dooble-2025.05.10_GH0.tar.gz) = 6503611
SHA256 (textbrowser-dooble-dictionaries-0f1e715_GH0.tar.gz) = 474b2fd45429ed4cf68347dedd2c47650310d7e53a23cbeb8452655f596dc80c
SIZE (textbrowser-dooble-dictionaries-0f1e715_GH0.tar.gz) = 34764866
diff --git a/www/element-web/Makefile b/www/element-web/Makefile
index 92dc5e60fcf7..99df9854099d 100644
--- a/www/element-web/Makefile
+++ b/www/element-web/Makefile
@@ -1,6 +1,6 @@
PORTNAME= element
DISTVERSIONPREFIX= v
-DISTVERSION= 1.11.100
+DISTVERSION= 1.11.101
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=667479c8bcd11a3fb5b2
+PLIST_SUB= COMMITID=f6ab405e59da2ba00d66
do-install:
@${MKDIR} ${STAGEDIR}${WWWDIR}
diff --git a/www/element-web/distinfo b/www/element-web/distinfo
index a8d87874acf9..25bb7b40bfa7 100644
--- a/www/element-web/distinfo
+++ b/www/element-web/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746612506
-SHA256 (element-v1.11.100.tar.gz) = bc4d77152d544fa40fccd7c7e5b6ace4e8ae266f4a2cc1b334b25733c6d1f8cd
-SIZE (element-v1.11.100.tar.gz) = 34364532
+TIMESTAMP = 1747807547
+SHA256 (element-v1.11.101.tar.gz) = 539bc978d08bcdade4eb4f62d0c9635211e867d8605425c778b82334d2d5b1c2
+SIZE (element-v1.11.101.tar.gz) = 34385333
diff --git a/www/element-web/pkg-plist b/www/element-web/pkg-plist
index 06d1f89bc538..264324cd8d88 100644
--- a/www/element-web/pkg-plist
+++ b/www/element-web/pkg-plist
@@ -6,9 +6,9 @@
%%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%%/1366.js
+%%WWWDIR%%/bundles/%%COMMITID%%/1366.js.LICENSE.txt
+%%WWWDIR%%/bundles/%%COMMITID%%/1366.js.map
%%WWWDIR%%/bundles/%%COMMITID%%/1526.js
%%WWWDIR%%/bundles/%%COMMITID%%/1526.js.map
%%WWWDIR%%/bundles/%%COMMITID%%/1787.js
@@ -32,9 +32,6 @@
%%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
@@ -75,6 +72,9 @@
%%WWWDIR%%/bundles/%%COMMITID%%/7766.js.map
%%WWWDIR%%/bundles/%%COMMITID%%/797.js
%%WWWDIR%%/bundles/%%COMMITID%%/797.js.map
+%%WWWDIR%%/bundles/%%COMMITID%%/8038.js
+%%WWWDIR%%/bundles/%%COMMITID%%/8038.js.LICENSE.txt
+%%WWWDIR%%/bundles/%%COMMITID%%/8038.js.map
%%WWWDIR%%/bundles/%%COMMITID%%/8227.js
%%WWWDIR%%/bundles/%%COMMITID%%/8227.js.map
%%WWWDIR%%/bundles/%%COMMITID%%/8901.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.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/cs.72f0269.json
+%%WWWDIR%%/i18n/cy.58ddc91.json
+%%WWWDIR%%/i18n/de_DE.30ed328.json
+%%WWWDIR%%/i18n/el.2c48ea0.json
+%%WWWDIR%%/i18n/en_EN.4ea020b.json
%%WWWDIR%%/i18n/eo.b5e64b9.json
-%%WWWDIR%%/i18n/es.814c4d1.json
-%%WWWDIR%%/i18n/et.4616345.json
+%%WWWDIR%%/i18n/es.ca5fbee.json
+%%WWWDIR%%/i18n/et.56f3774.json
%%WWWDIR%%/i18n/fa.ba2268f.json
-%%WWWDIR%%/i18n/fi.b074d4e.json
-%%WWWDIR%%/i18n/fr.71966ba.json
-%%WWWDIR%%/i18n/gl.8eae666.json
+%%WWWDIR%%/i18n/fi.496d222.json
+%%WWWDIR%%/i18n/fr.560e65f.json
+%%WWWDIR%%/i18n/gl.0e925cf.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/hu.9efd396.json
+%%WWWDIR%%/i18n/id.2b0ff70.json
+%%WWWDIR%%/i18n/is.485eb94.json
+%%WWWDIR%%/i18n/it.22cd41c.json
+%%WWWDIR%%/i18n/ja.163ae22.json
+%%WWWDIR%%/i18n/ka.d27657f.json
+%%WWWDIR%%/i18n/languages.6999855.json
%%WWWDIR%%/i18n/languages.json
-%%WWWDIR%%/i18n/lo.fabd37f.json
+%%WWWDIR%%/i18n/lo.e1fc5b3.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%%/i18n/lv.9aeee92.json
+%%WWWDIR%%/i18n/mg_MG.f531ee7.json
+%%WWWDIR%%/i18n/nb_NO.61be31c.json
+%%WWWDIR%%/i18n/nl.80f308f.json
+%%WWWDIR%%/i18n/pl.15fd78f.json
+%%WWWDIR%%/i18n/pt.66097fc.json
+%%WWWDIR%%/i18n/pt_BR.d2243dd.json
+%%WWWDIR%%/i18n/ru.3940db2.json
+%%WWWDIR%%/i18n/sk.2c62599.json
+%%WWWDIR%%/i18n/sq.fa459a7.json
+%%WWWDIR%%/i18n/sv.b947254.json
+%%WWWDIR%%/i18n/tr.ac852fc.json
+%%WWWDIR%%/i18n/uk.1d400e8.json
+%%WWWDIR%%/i18n/vi.e039736.json
+%%WWWDIR%%/i18n/zh_Hans.74a5bea.json
+%%WWWDIR%%/i18n/zh_Hant.1681834.json
%%WWWDIR%%/icons/bold.b7f0698.svg
%%WWWDIR%%/icons/check-circle.99c21d7.svg
%%WWWDIR%%/icons/check.aaad650.svg
@@ -520,6 +520,7 @@
%%WWWDIR%%/img/element-icons/roomlist/plus-circle.4fbd7e8.svg
%%WWWDIR%%/img/element-icons/roomlist/room-avatar-view-icon-mask.dfdc337.svg
%%WWWDIR%%/img/element-icons/roomlist/room-avatar-view-presence-mask.e2f8b62.svg
+%%WWWDIR%%/img/element-icons/roomlist/room-list-item-skeleton.b543c8a.svg
%%WWWDIR%%/img/element-icons/roomlist/skeleton-ui.fde3810.svg
%%WWWDIR%%/img/element-icons/settings/appearance.90cad21.svg
%%WWWDIR%%/img/element-icons/settings/desktop.05314b6.svg
@@ -692,27 +693,28 @@
%%WWWDIR%%/welcome/images/icon-help.svg
%%WWWDIR%%/welcome/images/icon-room-directory.svg
%%WWWDIR%%/welcome/images/icon-sign-in.svg
-%%WWWDIR%%/widgets/element-call/assets/IndexedDBWorker-DunQAoUH.js
-%%WWWDIR%%/widgets/element-call/assets/IndexedDBWorker-DunQAoUH.js.map
+%%WWWDIR%%/widgets/element-call/assets/IndexedDBWorker-whz4J8_U.js
+%%WWWDIR%%/widgets/element-call/assets/IndexedDBWorker-whz4J8_U.js.map
%%WWWDIR%%/widgets/element-call/assets/cat-4r_NkDcK.ogg
%%WWWDIR%%/widgets/element-call/assets/cat-Dd8bv_2W.mp3
%%WWWDIR%%/widgets/element-call/assets/clap-AxCMZLTd.ogg
%%WWWDIR%%/widgets/element-call/assets/clap-Dxm5qGyl.mp3
%%WWWDIR%%/widgets/element-call/assets/crickets-CcwrRdbq.mp3
%%WWWDIR%%/widgets/element-call/assets/crickets-DUJdcuUa.ogg
-%%WWWDIR%%/widgets/element-call/assets/de-app-BVrY_LcE.json
+%%WWWDIR%%/widgets/element-call/assets/cs-app-BIDxiN50.json
+%%WWWDIR%%/widgets/element-call/assets/de-app-Dn3BQmuZ.json
%%WWWDIR%%/widgets/element-call/assets/deer-91r1Gyrx.mp3
%%WWWDIR%%/widgets/element-call/assets/deer-DPSlVch4.ogg
%%WWWDIR%%/widgets/element-call/assets/dog-BoQdnF-w.mp3
%%WWWDIR%%/widgets/element-call/assets/dog-CxIWtkNX.ogg
%%WWWDIR%%/widgets/element-call/assets/el-app-Bgiig2Nz.json
-%%WWWDIR%%/widgets/element-call/assets/en-app-CaNSxxxY.json
-%%WWWDIR%%/widgets/element-call/assets/es-app-k4RDObng.json
-%%WWWDIR%%/widgets/element-call/assets/et-app-lXLRqT0e.json
-%%WWWDIR%%/widgets/element-call/assets/fr-app-DbyWYFAw.json
+%%WWWDIR%%/widgets/element-call/assets/en-app-LL1Igtxp.json
+%%WWWDIR%%/widgets/element-call/assets/es-app-Q3c7lmEj.json
+%%WWWDIR%%/widgets/element-call/assets/et-app-DPt7J6kw.json
+%%WWWDIR%%/widgets/element-call/assets/fr-app-BxTYbDfK.json
%%WWWDIR%%/widgets/element-call/assets/generic-BBbS3Wph.ogg
%%WWWDIR%%/widgets/element-call/assets/generic-BFeSb6fL.mp3
-%%WWWDIR%%/widgets/element-call/assets/id-app-C7u2K42_.json
+%%WWWDIR%%/widgets/element-call/assets/id-app-B-8jUQf1.json
%%WWWDIR%%/widgets/element-call/assets/inconsolata-latin-400-normal-Befkm-iY.woff
%%WWWDIR%%/widgets/element-call/assets/inconsolata-latin-400-normal-CjvQBeBR.woff2
%%WWWDIR%%/widgets/element-call/assets/inconsolata-latin-700-normal-BUbZx5Dd.woff2
@@ -726,14 +728,14 @@
%%WWWDIR%%/widgets/element-call/assets/inconsolata-vietnamese-700-normal-D1IfJGt6.woff
%%WWWDIR%%/widgets/element-call/assets/inconsolata-vietnamese-700-normal-DlaT3sch.woff2
%%WWWDIR%%/widgets/element-call/assets/index-BtY3MdEn.css
-%%WWWDIR%%/widgets/element-call/assets/index-CO76Uop_.js
-%%WWWDIR%%/widgets/element-call/assets/index-CO76Uop_.js.map
-%%WWWDIR%%/widgets/element-call/assets/index-ID8kuokP.js
-%%WWWDIR%%/widgets/element-call/assets/index-ID8kuokP.js.LICENSE.txt
-%%WWWDIR%%/widgets/element-call/assets/index-ID8kuokP.js.map
-%%WWWDIR%%/widgets/element-call/assets/index-K2xIZ1TO.js
-%%WWWDIR%%/widgets/element-call/assets/index-K2xIZ1TO.js.LICENSE.txt
-%%WWWDIR%%/widgets/element-call/assets/index-K2xIZ1TO.js.map
+%%WWWDIR%%/widgets/element-call/assets/index-CnwgenbU.js
+%%WWWDIR%%/widgets/element-call/assets/index-CnwgenbU.js.map
+%%WWWDIR%%/widgets/element-call/assets/index-DOJHP7J4.js
+%%WWWDIR%%/widgets/element-call/assets/index-DOJHP7J4.js.LICENSE.txt
+%%WWWDIR%%/widgets/element-call/assets/index-DOJHP7J4.js.map
+%%WWWDIR%%/widgets/element-call/assets/index-DgskObdj.js
+%%WWWDIR%%/widgets/element-call/assets/index-DgskObdj.js.LICENSE.txt
+%%WWWDIR%%/widgets/element-call/assets/index-DgskObdj.js.map
%%WWWDIR%%/widgets/element-call/assets/inter-cyrillic-400-normal-BLGc9T1a.woff2
%%WWWDIR%%/widgets/element-call/assets/inter-cyrillic-400-normal-ZzOtrSSW.woff
%%WWWDIR%%/widgets/element-call/assets/inter-cyrillic-500-normal-D4Vwzodn.woff2
@@ -790,16 +792,17 @@
%%WWWDIR%%/widgets/element-call/assets/inter-vietnamese-600-normal-Cm6aH8_k.woff
%%WWWDIR%%/widgets/element-call/assets/inter-vietnamese-700-normal-CGpBpxLq.woff2
%%WWWDIR%%/widgets/element-call/assets/inter-vietnamese-700-normal-dAnkLlTo.woff
-%%WWWDIR%%/widgets/element-call/assets/it-app-Brq71wxA.json
+%%WWWDIR%%/widgets/element-call/assets/it-app-Cik25Qgd.json
+%%WWWDIR%%/widgets/element-call/assets/ja-app-Cp_00ujI.json
%%WWWDIR%%/widgets/element-call/assets/join_call-DlMV9nHk.ogg
%%WWWDIR%%/widgets/element-call/assets/join_call-dEJCP2wD.mp3
%%WWWDIR%%/widgets/element-call/assets/left_call-BbqmRgnC.mp3
%%WWWDIR%%/widgets/element-call/assets/left_call-C7NMl6WI.ogg
%%WWWDIR%%/widgets/element-call/assets/lightbulb-BIeJtAR_.ogg
%%WWWDIR%%/widgets/element-call/assets/lightbulb-BrnY00qi.mp3
-%%WWWDIR%%/widgets/element-call/assets/livekit-client.e2ee.worker-uNa5aSsA.js
-%%WWWDIR%%/widgets/element-call/assets/livekit-client.e2ee.worker-uNa5aSsA.js.map
-%%WWWDIR%%/widgets/element-call/assets/lv-app--dkl5K2p.json
+%%WWWDIR%%/widgets/element-call/assets/livekit-client.e2ee.worker-P7E4-zMp.js
+%%WWWDIR%%/widgets/element-call/assets/livekit-client.e2ee.worker-P7E4-zMp.js.map
+%%WWWDIR%%/widgets/element-call/assets/lv-app-J9DGb4uv.json
%%WWWDIR%%/widgets/element-call/assets/matrix-sdk-crypto-wasm-D9e1T4vy.js
%%WWWDIR%%/widgets/element-call/assets/matrix-sdk-crypto-wasm-D9e1T4vy.js.map
%%WWWDIR%%/widgets/element-call/assets/matrix_sdk_crypto_wasm_bg-B6p0UpxL.wasm
@@ -808,26 +811,28 @@
%%WWWDIR%%/widgets/element-call/assets/pako.esm-Bt8vjcgE.js.map
%%WWWDIR%%/widgets/element-call/assets/party-BZPeTgC3.mp3
%%WWWDIR%%/widgets/element-call/assets/party-D7rIOhAQ.ogg
-%%WWWDIR%%/widgets/element-call/assets/pl-app-DGeQk6oM.json
-%%WWWDIR%%/widgets/element-call/assets/polyfill-force-CVX0K6-A.js
-%%WWWDIR%%/widgets/element-call/assets/polyfill-force-CVX0K6-A.js.map
-%%WWWDIR%%/widgets/element-call/assets/polyfill-force-nR8-tTWm.js
-%%WWWDIR%%/widgets/element-call/assets/polyfill-force-nR8-tTWm.js.map
+%%WWWDIR%%/widgets/element-call/assets/pl-app-CUkXVSZk.json
+%%WWWDIR%%/widgets/element-call/assets/polyfill-force-DmQV3-w7.js
+%%WWWDIR%%/widgets/element-call/assets/polyfill-force-DmQV3-w7.js.map
+%%WWWDIR%%/widgets/element-call/assets/polyfill-force-DxJcBG4e.js
+%%WWWDIR%%/widgets/element-call/assets/polyfill-force-DxJcBG4e.js.map
%%WWWDIR%%/widgets/element-call/assets/raise_hand-Bzqn65WB.mp3
%%WWWDIR%%/widgets/element-call/assets/raise_hand-CUbxEnt9.ogg
-%%WWWDIR%%/widgets/element-call/assets/ro-app-C7W3EjXp.json
+%%WWWDIR%%/widgets/element-call/assets/ro-app-KHxgbZz-.json
%%WWWDIR%%/widgets/element-call/assets/rock-BVCJXNC-.ogg
%%WWWDIR%%/widgets/element-call/assets/rock-CHdnB31m.mp3
-%%WWWDIR%%/widgets/element-call/assets/ru-app-B-FtZqJU.json
+%%WWWDIR%%/widgets/element-call/assets/ru-app-eoBdfBL5.json
%%WWWDIR%%/widgets/element-call/assets/screen_share_started-DH3qxml5.mp3
%%WWWDIR%%/widgets/element-call/assets/screen_share_started-IZDL-kAw.ogg
-%%WWWDIR%%/widgets/element-call/assets/sk-app-C-Uhf1j4.json
-%%WWWDIR%%/widgets/element-call/assets/spa-guyHZvo_.js
-%%WWWDIR%%/widgets/element-call/assets/spa-guyHZvo_.js.map
-%%WWWDIR%%/widgets/element-call/assets/uk-app-BxyP4dDT.json
+%%WWWDIR%%/widgets/element-call/assets/sk-app-oyZEXyo9.json
+%%WWWDIR%%/widgets/element-call/assets/spa-DVTankup.js
+%%WWWDIR%%/widgets/element-call/assets/spa-DVTankup.js.map
+%%WWWDIR%%/widgets/element-call/assets/sv-app-D3UhBwmo.json
+%%WWWDIR%%/widgets/element-call/assets/tr-app-Dk--6BpP.json
+%%WWWDIR%%/widgets/element-call/assets/uk-app-8w2P6iQj.json
%%WWWDIR%%/widgets/element-call/assets/wave-Bzf1LSMH.mp3
%%WWWDIR%%/widgets/element-call/assets/wave-FiiOzicp.ogg
-%%WWWDIR%%/widgets/element-call/assets/zh-Hans-app-CCvn5Yaa.json
-%%WWWDIR%%/widgets/element-call/assets/zh-Hant-app-bsZKL_R6.json
+%%WWWDIR%%/widgets/element-call/assets/zh-Hans-app-8pDbXAOO.json
+%%WWWDIR%%/widgets/element-call/assets/zh-Hant-app-BV1LKS_j.json
%%WWWDIR%%/widgets/element-call/config.json
%%WWWDIR%%/widgets/element-call/index.html
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 87e8fbb2bb31..d521f30bb923 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -1,5 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 128.10.0
+DISTVERSION= 128.11.0
PORTEPOCH= 1
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox-esr/distinfo b/www/firefox-esr/distinfo
index f00cbf005dc9..6106e2d7d20d 100644
--- a/www/firefox-esr/distinfo
+++ b/www/firefox-esr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745263534
-SHA256 (firefox-128.10.0esr.source.tar.xz) = 2ed83e26e41a8b3e2c7c0d13448a84dbb9b7ed65ed46bc162d629b0c6b071caf
-SIZE (firefox-128.10.0esr.source.tar.xz) = 556644356
+TIMESTAMP = 1747683814
+SHA256 (firefox-128.11.0esr.source.tar.xz) = f2ed90374a670fe5eccfd5bf36d2e311affd955d1f3507861c738b9aa7a1ffec
+SIZE (firefox-128.11.0esr.source.tar.xz) = 558920388
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 391762f538d6..73ee42ec0def 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,5 +1,5 @@
PORTNAME= firefox
-DISTVERSION= 138.0.1
+DISTVERSION= 139.0
PORTEPOCH= 2
CATEGORIES= www wayland
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}${DISTVERSIONSUFFIX}/source \
@@ -21,7 +21,6 @@ BUILD_DEPENDS= nspr>=4.32:devel/nspr \
libvpx>=1.15.0:multimedia/libvpx \
${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
v4l_compat>0:multimedia/v4l_compat \
- autoconf2.13:devel/autoconf2.13 \
nasm:devel/nasm \
yasm:devel/yasm \
zip:archivers/zip \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index c8c179d239f5..99763b7efafa 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746105917
-SHA256 (firefox-138.0.1.source.tar.xz) = 9894b96203876f847637af20f961cd4494ff1f2d85e4c096a7f358f54d9ecb2b
-SIZE (firefox-138.0.1.source.tar.xz) = 632213452
+TIMESTAMP = 1747682762
+SHA256 (firefox-139.0.source.tar.xz) = 2cb72f0c9e6135665ebdceb4d6da99916544d5d5ab7cdca03747467fda2078d5
+SIZE (firefox-139.0.source.tar.xz) = 641547368
diff --git a/www/firefox/files/patch-bug847568 b/www/firefox/files/patch-bug847568
index f3e7ecbc1a13..5b557e0e5a86 100644
--- a/www/firefox/files/patch-bug847568
+++ b/www/firefox/files/patch-bug847568
@@ -178,38 +178,6 @@ index 1bb0430f01aa..0360e0f468c0 100644
# need to include etld_data.inc
LOCAL_INCLUDES += [
"/netwerk/base",
-diff --git old-configure.in old-configure.in
-index 1af75c496b15..f1c7d7c48d28 100644
---- old-configure.in
-+++ old-configure.in
-@@ -167,6 +167,27 @@ fi
- AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID)
- AC_SUBST(MOZ_MACBUNDLE_ID)
-
-+dnl ========================================================
-+dnl Check for graphite2
-+dnl ========================================================
-+if test -n "$MOZ_SYSTEM_GRAPHITE2"; then
-+ dnl graphite2.pc has bogus version, check manually
-+ _SAVE_CFLAGS=$CFLAGS
-+ CFLAGS="$CFLAGS $MOZ_GRAPHITE2_CFLAGS"
-+ AC_TRY_COMPILE([ #include <graphite2/Font.h>
-+ #define GR2_VERSION_REQUIRE(major,minor,bugfix) \
-+ ( GR2_VERSION_MAJOR * 10000 + GR2_VERSION_MINOR \
-+ * 100 + GR2_VERSION_BUGFIX >= \
-+ (major) * 10000 + (minor) * 100 + (bugfix) )
-+ ], [
-+ #if !GR2_VERSION_REQUIRE(1,3,14)
-+ #error "Insufficient graphite2 version."
-+ #endif
-+ ], [],
-+ [AC_MSG_ERROR([--with-system-graphite2 requested but no working libgraphite2 found])])
-+ CFLAGS=$_SAVE_CFLAGS
-+fi
-+
- dnl ========================================================
- dnl = Child Process Name for IPC
- dnl ========================================================
diff --git security/rlbox/moz.build security/rlbox/moz.build
index 7ad8d076f0f1..835b9d905e03 100644
--- security/rlbox/moz.build
diff --git a/www/firefox/files/patch-ipc_glue_GeckoChildProcessHost.cpp b/www/firefox/files/patch-ipc_glue_GeckoChildProcessHost.cpp
new file mode 100644
index 000000000000..42f5f25add33
--- /dev/null
+++ b/www/firefox/files/patch-ipc_glue_GeckoChildProcessHost.cpp
@@ -0,0 +1,13 @@
+diff --git ipc/glue/GeckoChildProcessHost.cpp ipc/glue/GeckoChildProcessHost.cpp
+index 9bb8314bd98c..2bc0382a9385 100644
+--- ipc/glue/GeckoChildProcessHost.cpp
++++ ipc/glue/GeckoChildProcessHost.cpp
+@@ -1121,7 +1121,7 @@ Result<Ok, LaunchError> BaseProcessLauncher::DoSetup() {
+ #if defined(MOZ_WIDGET_COCOA) || defined(XP_WIN)
+ geckoargs::sCrashReporter.Put(CrashReporter::GetChildNotificationPipe(),
+ mChildArgs);
+-#elif defined(XP_UNIX) && !defined(XP_IOS)
++#elif defined(XP_UNIX) && !defined(XP_IOS) && !defined(XP_FREEBSD)
+ UniqueFileHandle childCrashFd = CrashReporter::GetChildNotificationPipe();
+ if (!childCrashFd) {
+ return Err(LaunchError("DuplicateFileHandle failed"));
diff --git a/www/firefox/files/patch-libwebrtc-generated b/www/firefox/files/patch-libwebrtc-generated
index aeaeb15d05cd..c0440e492420 100644
--- a/www/firefox/files/patch-libwebrtc-generated
+++ b/www/firefox/files/patch-libwebrtc-generated
@@ -1,14 +1,15 @@
-commit 5ea36422bfaa3e795cd42f94a26f0cb567404dce
+commit 48d36a84fea34e509b18e2772c21699d24e8a1a7
Author: Christoph Moench-Tegeder <cmt@FreeBSD.org>
+Date: Wed May 14 20:58:36 2025 +0000
- regenerate FreeBSD libwebrtc patch for Firefox 138
+ regenerate FreeBSD libwebrtc patch for gecko 139
diff --git third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-index 655ef59cba4b..d54f6dbed565 100644
+index a29aef4b45e5..c193c4232adf 100644
--- third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
+++ third_party/libwebrtc/api/adaptation/resource_adaptation_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -28,7 +29,7 @@ index 655ef59cba4b..d54f6dbed565 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -215,11 +216,11 @@ index 655ef59cba4b..d54f6dbed565 100644
Library("resource_adaptation_api_gn")
diff --git third_party/libwebrtc/api/array_view_gn/moz.build third_party/libwebrtc/api/array_view_gn/moz.build
-index d4382d1df1cc..0a1c7b839dda 100644
+index 642158f0b8be..994364e58ce4 100644
--- third_party/libwebrtc/api/array_view_gn/moz.build
+++ third_party/libwebrtc/api/array_view_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -239,7 +240,7 @@ index d4382d1df1cc..0a1c7b839dda 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -353,7 +354,7 @@ index d4382d1df1cc..0a1c7b839dda 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -406,11 +407,11 @@ index d4382d1df1cc..0a1c7b839dda 100644
-
Library("array_view_gn")
diff --git third_party/libwebrtc/api/async_dns_resolver_gn/moz.build third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-index e935019626ad..b6efeac78e76 100644
+index c7f482cc2e28..e44aba4a8252 100644
--- third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
+++ third_party/libwebrtc/api/async_dns_resolver_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -430,7 +431,7 @@ index e935019626ad..b6efeac78e76 100644
FINAL_LIBRARY = "xul"
-@@ -39,120 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,120 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -552,7 +553,7 @@ index e935019626ad..b6efeac78e76 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -162,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -163,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -605,11 +606,11 @@ index e935019626ad..b6efeac78e76 100644
-
Library("async_dns_resolver_gn")
diff --git third_party/libwebrtc/api/audio/aec3_config_gn/moz.build third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-index cfb3b6961c8e..daf2b9c13beb 100644
+index 8113afb08273..123471602ffd 100644
--- third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -629,7 +630,7 @@ index cfb3b6961c8e..daf2b9c13beb 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -816,11 +817,11 @@ index cfb3b6961c8e..daf2b9c13beb 100644
Library("aec3_config_gn")
diff --git third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-index 589d5a72ef9b..9311473ef1a8 100644
+index 658f1cf59805..da98391aded6 100644
--- third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio/aec3_factory_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -841,7 +842,7 @@ index 589d5a72ef9b..9311473ef1a8 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1039,11 +1040,11 @@ index 589d5a72ef9b..9311473ef1a8 100644
Library("aec3_factory_gn")
diff --git third_party/libwebrtc/api/audio/audio_device_gn/moz.build third_party/libwebrtc/api/audio/audio_device_gn/moz.build
-index a727e70ec91d..956114463750 100644
+index 01d48ab0e9bf..3885140cb11b 100644
--- third_party/libwebrtc/api/audio/audio_device_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_device_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -1063,7 +1064,7 @@ index a727e70ec91d..956114463750 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1177,7 +1178,7 @@ index a727e70ec91d..956114463750 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1230,11 +1231,11 @@ index a727e70ec91d..956114463750 100644
-
Library("audio_device_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-index 0cf70f6a0a66..f121290ac495 100644
+index 95225d12b2f5..fe08226343af 100644
--- third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -1254,7 +1255,7 @@ index 0cf70f6a0a66..f121290ac495 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1448,11 +1449,11 @@ index 0cf70f6a0a66..f121290ac495 100644
Library("audio_frame_api_gn")
diff --git third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-index d9e237b4c753..f34df50bef47 100644
+index 7b23511c9930..a97e948e3a43 100644
--- third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_frame_processor_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -1472,7 +1473,7 @@ index d9e237b4c753..f34df50bef47 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1582,7 +1583,7 @@ index d9e237b4c753..f34df50bef47 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1635,11 +1636,11 @@ index d9e237b4c753..f34df50bef47 100644
-
Library("audio_frame_processor_gn")
diff --git third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-index 9576084c2bfb..aca2a4d6a37f 100644
+index d650f934bf12..28f47d4bb60c 100644
--- third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_mixer_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -1659,7 +1660,7 @@ index 9576084c2bfb..aca2a4d6a37f 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -1780,7 +1781,7 @@ index 9576084c2bfb..aca2a4d6a37f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -1833,11 +1834,11 @@ index 9576084c2bfb..aca2a4d6a37f 100644
-
Library("audio_mixer_api_gn")
diff --git third_party/libwebrtc/api/audio/audio_processing_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-index 2e7d38d911f4..fb9329509240 100644
+index 4013ba0e53e8..d6bf78db5064 100644
--- third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_processing_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -1857,7 +1858,7 @@ index 2e7d38d911f4..fb9329509240 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2044,11 +2045,11 @@ index 2e7d38d911f4..fb9329509240 100644
Library("audio_processing_gn")
diff --git third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-index 0400bcf1bdfc..9275b9e39050 100644
+index 020423429a5e..de7f6742627a 100644
--- third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
+++ third_party/libwebrtc/api/audio/audio_processing_statistics_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -2068,7 +2069,7 @@ index 0400bcf1bdfc..9275b9e39050 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2251,11 +2252,11 @@ index 0400bcf1bdfc..9275b9e39050 100644
Library("audio_processing_statistics_gn")
diff --git third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
-index af681d4d0d28..dd6059825208 100644
+index 9720fc943734..43ee9e3a60aa 100644
--- third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
+++ third_party/libwebrtc/api/audio/builtin_audio_processing_builder_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -2276,7 +2277,7 @@ index af681d4d0d28..dd6059825208 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2474,11 +2475,11 @@ index af681d4d0d28..dd6059825208 100644
Library("builtin_audio_processing_builder_gn")
diff --git third_party/libwebrtc/api/audio/echo_control_gn/moz.build third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-index 904a224b5a88..9bb9eff44ed7 100644
+index f554fd6f8241..b068f7739302 100644
--- third_party/libwebrtc/api/audio/echo_control_gn/moz.build
+++ third_party/libwebrtc/api/audio/echo_control_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -2498,7 +2499,7 @@ index 904a224b5a88..9bb9eff44ed7 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2612,7 +2613,7 @@ index 904a224b5a88..9bb9eff44ed7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -2665,11 +2666,11 @@ index 904a224b5a88..9bb9eff44ed7 100644
-
Library("echo_control_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-index ae4047c15bad..b7d03e2fb268 100644
+index cc8409b4ab86..ae6f50e873d1 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_decoder_L16_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -2689,7 +2690,7 @@ index ae4047c15bad..b7d03e2fb268 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -2883,11 +2884,11 @@ index ae4047c15bad..b7d03e2fb268 100644
Library("audio_decoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-index 9007bea06a57..5c76a4bbb10f 100644
+index 4c7addbccf20..87731b62a8fd 100644
--- third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/L16/audio_encoder_L16_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -2907,7 +2908,7 @@ index 9007bea06a57..5c76a4bbb10f 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3101,11 +3102,11 @@ index 9007bea06a57..5c76a4bbb10f 100644
Library("audio_encoder_L16_gn")
diff --git third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-index 1de066daa01e..475c29ae92d2 100644
+index 0cd4e6611370..e1bdc203eda4 100644
--- third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/audio_codecs_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -3125,7 +3126,7 @@ index 1de066daa01e..475c29ae92d2 100644
FINAL_LIBRARY = "xul"
-@@ -46,186 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,186 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3319,11 +3320,11 @@ index 1de066daa01e..475c29ae92d2 100644
Library("audio_codecs_api_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-index be74a5a11b8d..517b3b57ed6b 100644
+index 6225ac1f3f3b..1cea1d96da7b 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_decoder_factory_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -3344,7 +3345,7 @@ index be74a5a11b8d..517b3b57ed6b 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3542,11 +3543,11 @@ index be74a5a11b8d..517b3b57ed6b 100644
Library("builtin_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-index f6a0d16b0b5c..4c5f8099504f 100644
+index e37b27978fb1..1532babfe849 100644
--- third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/builtin_audio_encoder_factory_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -3567,7 +3568,7 @@ index f6a0d16b0b5c..4c5f8099504f 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3765,11 +3766,11 @@ index f6a0d16b0b5c..4c5f8099504f 100644
Library("builtin_audio_encoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-index 58fffb2e22d1..c883304f6928 100644
+index edebd9ce86d9..05322dea51b6 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_decoder_g711_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -3789,7 +3790,7 @@ index 58fffb2e22d1..c883304f6928 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -3983,11 +3984,11 @@ index 58fffb2e22d1..c883304f6928 100644
Library("audio_decoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-index 7f12ebe49f01..0399f439f107 100644
+index 40dbaf52b249..7863dd9e6633 100644
--- third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g711/audio_encoder_g711_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -4007,7 +4008,7 @@ index 7f12ebe49f01..0399f439f107 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4201,11 +4202,11 @@ index 7f12ebe49f01..0399f439f107 100644
Library("audio_encoder_g711_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-index e808e4298249..d9457426de70 100644
+index 376963441f83..94f0257efd1e 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_decoder_g722_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -4225,7 +4226,7 @@ index e808e4298249..d9457426de70 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4419,11 +4420,11 @@ index e808e4298249..d9457426de70 100644
Library("audio_decoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-index 5e4da695b94a..724106b4aea7 100644
+index 982fb48b055c..fabe33115004 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -4443,7 +4444,7 @@ index 5e4da695b94a..724106b4aea7 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4564,7 +4565,7 @@ index 5e4da695b94a..724106b4aea7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -4617,11 +4618,11 @@ index 5e4da695b94a..724106b4aea7 100644
-
Library("audio_encoder_g722_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-index 1ea3e2809c53..4d8340d021cd 100644
+index b8593150d582..4d357bd55c31 100644
--- third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/g722/audio_encoder_g722_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -4641,7 +4642,7 @@ index 1ea3e2809c53..4d8340d021cd 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -4835,11 +4836,11 @@ index 1ea3e2809c53..4d8340d021cd 100644
Library("audio_encoder_g722_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-index 37f380708aa3..abf91648be19 100644
+index bf3eeaa88803..de644f4d586e 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_multiopus_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -4859,7 +4860,7 @@ index 37f380708aa3..abf91648be19 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5053,11 +5054,11 @@ index 37f380708aa3..abf91648be19 100644
Library("audio_decoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-index 38ae3cb77d4a..ec98b9e1da9d 100644
+index 7c069bac99c3..e1b09fbd1410 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -5077,7 +5078,7 @@ index 38ae3cb77d4a..ec98b9e1da9d 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5198,7 +5199,7 @@ index 38ae3cb77d4a..ec98b9e1da9d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -5251,11 +5252,11 @@ index 38ae3cb77d4a..ec98b9e1da9d 100644
-
Library("audio_decoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-index 7c496999196d..1ef54111434a 100644
+index d7116c1b25af..d2fdc6c52b17 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_decoder_opus_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -5275,7 +5276,7 @@ index 7c496999196d..1ef54111434a 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5473,11 +5474,11 @@ index 7c496999196d..1ef54111434a 100644
Library("audio_decoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-index 089a1a45e301..233f98cf79a9 100644
+index 44bd92989657..2e9b48f8a1ca 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_multiopus_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -5497,7 +5498,7 @@ index 089a1a45e301..233f98cf79a9 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5691,11 +5692,11 @@ index 089a1a45e301..233f98cf79a9 100644
Library("audio_encoder_multiopus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-index a51951b06a09..2d9efa02ffa4 100644
+index e434bc36d641..4de657a3de7b 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_config_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -5716,7 +5717,7 @@ index a51951b06a09..2d9efa02ffa4 100644
FINAL_LIBRARY = "xul"
-@@ -48,175 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,175 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -5899,11 +5900,11 @@ index a51951b06a09..2d9efa02ffa4 100644
Library("audio_encoder_opus_config_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-index 8b4a7d737129..1d68afeb665c 100644
+index ce10e371bb68..f923b1df29e5 100644
--- third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus/audio_encoder_opus_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -5923,7 +5924,7 @@ index 8b4a7d737129..1d68afeb665c 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6121,11 +6122,11 @@ index 8b4a7d737129..1d68afeb665c 100644
Library("audio_encoder_opus_gn")
diff --git third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
-index 394c4633e5be..a8566871ce2d 100644
+index 70a8757803e7..3ea74de51e24 100644
--- third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/audio_codecs/opus_audio_decoder_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -6145,7 +6146,7 @@ index 394c4633e5be..a8566871ce2d 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6343,11 +6344,11 @@ index 394c4633e5be..a8566871ce2d 100644
Library("opus_audio_decoder_factory_gn")
diff --git third_party/libwebrtc/api/audio_options_api_gn/moz.build third_party/libwebrtc/api/audio_options_api_gn/moz.build
-index f3d9e0c5c619..c8cc49dfc388 100644
+index 4034a555945f..1bad1c4d1894 100644
--- third_party/libwebrtc/api/audio_options_api_gn/moz.build
+++ third_party/libwebrtc/api/audio_options_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -6367,7 +6368,7 @@ index f3d9e0c5c619..c8cc49dfc388 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6554,11 +6555,11 @@ index f3d9e0c5c619..c8cc49dfc388 100644
Library("audio_options_api_gn")
diff --git third_party/libwebrtc/api/bitrate_allocation_gn/moz.build third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-index 5afb81f93349..1125b25cc2fe 100644
+index 5a740fe980cc..00fd8d6b5ab6 100644
--- third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/bitrate_allocation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -6578,7 +6579,7 @@ index 5afb81f93349..1125b25cc2fe 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6692,7 +6693,7 @@ index 5afb81f93349..1125b25cc2fe 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6745,11 +6746,11 @@ index 5afb81f93349..1125b25cc2fe 100644
-
Library("bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/call_api_gn/moz.build third_party/libwebrtc/api/call_api_gn/moz.build
-index 87ce5be77f85..abcfd171700e 100644
+index af61fa96fb07..934c8061dd1a 100644
--- third_party/libwebrtc/api/call_api_gn/moz.build
+++ third_party/libwebrtc/api/call_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -6769,7 +6770,7 @@ index 87ce5be77f85..abcfd171700e 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -6879,7 +6880,7 @@ index 87ce5be77f85..abcfd171700e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -6932,11 +6933,11 @@ index 87ce5be77f85..abcfd171700e 100644
-
Library("call_api_gn")
diff --git third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-index f04389690b02..d7c73ce42b03 100644
+index fe1f7bc13e24..5d8265e6ec96 100644
--- third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_decryptor_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -6956,7 +6957,7 @@ index f04389690b02..d7c73ce42b03 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7070,7 +7071,7 @@ index f04389690b02..d7c73ce42b03 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7123,11 +7124,11 @@ index f04389690b02..d7c73ce42b03 100644
-
Library("frame_decryptor_interface_gn")
diff --git third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-index 4085a759f65d..2388275f9ba6 100644
+index 999863e78f35..acdaa73774aa 100644
--- third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
+++ third_party/libwebrtc/api/crypto/frame_encryptor_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -7147,7 +7148,7 @@ index 4085a759f65d..2388275f9ba6 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7261,7 +7262,7 @@ index 4085a759f65d..2388275f9ba6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7314,11 +7315,11 @@ index 4085a759f65d..2388275f9ba6 100644
-
Library("frame_encryptor_interface_gn")
diff --git third_party/libwebrtc/api/crypto/options_gn/moz.build third_party/libwebrtc/api/crypto/options_gn/moz.build
-index 924a8c8bad70..82a22cce2ccd 100644
+index 71008a1b781a..a614772c39d2 100644
--- third_party/libwebrtc/api/crypto/options_gn/moz.build
+++ third_party/libwebrtc/api/crypto/options_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -7338,7 +7339,7 @@ index 924a8c8bad70..82a22cce2ccd 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7525,11 +7526,11 @@ index 924a8c8bad70..82a22cce2ccd 100644
Library("options_gn")
diff --git third_party/libwebrtc/api/environment/environment_factory_gn/moz.build third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-index 76d8ff92e999..debb1ddd5c3a 100644
+index 0996db596135..a32dc41fe41f 100644
--- third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
+++ third_party/libwebrtc/api/environment/environment_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -7549,7 +7550,7 @@ index 76d8ff92e999..debb1ddd5c3a 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7747,11 +7748,11 @@ index 76d8ff92e999..debb1ddd5c3a 100644
Library("environment_factory_gn")
diff --git third_party/libwebrtc/api/environment/environment_gn/moz.build third_party/libwebrtc/api/environment/environment_gn/moz.build
-index 0bb75b315e5a..000242d51165 100644
+index 0b458299cbb0..fc391b227ad3 100644
--- third_party/libwebrtc/api/environment/environment_gn/moz.build
+++ third_party/libwebrtc/api/environment/environment_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -7771,7 +7772,7 @@ index 0bb75b315e5a..000242d51165 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -7881,7 +7882,7 @@ index 0bb75b315e5a..000242d51165 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -7934,11 +7935,11 @@ index 0bb75b315e5a..000242d51165 100644
-
Library("environment_gn")
diff --git third_party/libwebrtc/api/fec_controller_api_gn/moz.build third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-index fef918e83259..d83eac28dd73 100644
+index 8256e9ef6578..71085b8a0208 100644
--- third_party/libwebrtc/api/fec_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/fec_controller_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -7958,7 +7959,7 @@ index fef918e83259..d83eac28dd73 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8072,7 +8073,7 @@ index fef918e83259..d83eac28dd73 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8125,11 +8126,11 @@ index fef918e83259..d83eac28dd73 100644
-
Library("fec_controller_api_gn")
diff --git third_party/libwebrtc/api/field_trials_registry_gn/moz.build third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-index 8e25c5f0af23..27d919a95bd9 100644
+index c4645bf682f2..ef81a5cfa0f6 100644
--- third_party/libwebrtc/api/field_trials_registry_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_registry_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -8149,7 +8150,7 @@ index 8e25c5f0af23..27d919a95bd9 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8343,11 +8344,11 @@ index 8e25c5f0af23..27d919a95bd9 100644
Library("field_trials_registry_gn")
diff --git third_party/libwebrtc/api/field_trials_view_gn/moz.build third_party/libwebrtc/api/field_trials_view_gn/moz.build
-index 3b251e442736..935aaf609f1e 100644
+index a6f7605626bc..f28ccdfa0f3d 100644
--- third_party/libwebrtc/api/field_trials_view_gn/moz.build
+++ third_party/libwebrtc/api/field_trials_view_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -8367,7 +8368,7 @@ index 3b251e442736..935aaf609f1e 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8477,7 +8478,7 @@ index 3b251e442736..935aaf609f1e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8530,11 +8531,11 @@ index 3b251e442736..935aaf609f1e 100644
-
Library("field_trials_view_gn")
diff --git third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-index f4f1de37c757..7bd0919f032f 100644
+index 83b184870ac0..a6ca7af93bd2 100644
--- third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
+++ third_party/libwebrtc/api/frame_transformer_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -8554,7 +8555,7 @@ index f4f1de37c757..7bd0919f032f 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8748,11 +8749,11 @@ index f4f1de37c757..7bd0919f032f 100644
Library("frame_transformer_interface_gn")
diff --git third_party/libwebrtc/api/function_view_gn/moz.build third_party/libwebrtc/api/function_view_gn/moz.build
-index ead33463bfc3..6f7ba527bf72 100644
+index 6c82fcf77a1c..c75f2fa7adb8 100644
--- third_party/libwebrtc/api/function_view_gn/moz.build
+++ third_party/libwebrtc/api/function_view_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -8772,7 +8773,7 @@ index ead33463bfc3..6f7ba527bf72 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -8886,7 +8887,7 @@ index ead33463bfc3..6f7ba527bf72 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -8939,11 +8940,11 @@ index ead33463bfc3..6f7ba527bf72 100644
-
Library("function_view_gn")
diff --git third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-index d7611c9edebe..451b3e815625 100644
+index c6e7793cb8ce..c5f2988c9cf3 100644
--- third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_logging_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -8963,7 +8964,7 @@ index d7611c9edebe..451b3e815625 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9073,7 +9074,7 @@ index d7611c9edebe..451b3e815625 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9126,11 +9127,11 @@ index d7611c9edebe..451b3e815625 100644
-
Library("jingle_logging_api_gn")
diff --git third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-index 8b5a49c259d0..381fb63fcfbf 100644
+index cc16ead8d247..89ce43a135f6 100644
--- third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
+++ third_party/libwebrtc/api/libjingle_peerconnection_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -9150,7 +9151,7 @@ index 8b5a49c259d0..381fb63fcfbf 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9260,7 +9261,7 @@ index 8b5a49c259d0..381fb63fcfbf 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9313,11 +9314,11 @@ index 8b5a49c259d0..381fb63fcfbf 100644
-
Library("jingle_peerconnection_api_gn")
diff --git third_party/libwebrtc/api/location_gn/moz.build third_party/libwebrtc/api/location_gn/moz.build
-index cae29c6f01cd..9c6045f7715e 100644
+index 6d66e59ebb7b..caaa00483d3e 100644
--- third_party/libwebrtc/api/location_gn/moz.build
+++ third_party/libwebrtc/api/location_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -9337,7 +9338,7 @@ index cae29c6f01cd..9c6045f7715e 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9447,7 +9448,7 @@ index cae29c6f01cd..9c6045f7715e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9500,11 +9501,11 @@ index cae29c6f01cd..9c6045f7715e 100644
-
Library("location_gn")
diff --git third_party/libwebrtc/api/make_ref_counted_gn/moz.build third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-index e7975c529738..23fb60720340 100644
+index 004d1dd755b9..d8144cd18e60 100644
--- third_party/libwebrtc/api/make_ref_counted_gn/moz.build
+++ third_party/libwebrtc/api/make_ref_counted_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -9524,7 +9525,7 @@ index e7975c529738..23fb60720340 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9634,7 +9635,7 @@ index e7975c529738..23fb60720340 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -9687,11 +9688,11 @@ index e7975c529738..23fb60720340 100644
-
Library("make_ref_counted_gn")
diff --git third_party/libwebrtc/api/media_stream_interface_gn/moz.build third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-index 5b64e7f79ad8..a29d14c3f815 100644
+index 54aa80738e3c..5c0f76f23d55 100644
--- third_party/libwebrtc/api/media_stream_interface_gn/moz.build
+++ third_party/libwebrtc/api/media_stream_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -9711,7 +9712,7 @@ index 5b64e7f79ad8..a29d14c3f815 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -9905,11 +9906,11 @@ index 5b64e7f79ad8..a29d14c3f815 100644
Library("media_stream_interface_gn")
diff --git third_party/libwebrtc/api/metronome/metronome_gn/moz.build third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-index dcd60714813d..de97bbbba76f 100644
+index b1b97440e4e4..e9b473ead2b4 100644
--- third_party/libwebrtc/api/metronome/metronome_gn/moz.build
+++ third_party/libwebrtc/api/metronome/metronome_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -9929,7 +9930,7 @@ index dcd60714813d..de97bbbba76f 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10043,7 +10044,7 @@ index dcd60714813d..de97bbbba76f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10096,11 +10097,11 @@ index dcd60714813d..de97bbbba76f 100644
-
Library("metronome_gn")
diff --git third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-index ebb57e97affb..2a03f232a3f2 100644
+index 31dfa96d1368..3477a521945c 100644
--- third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
+++ third_party/libwebrtc/api/neteq/default_neteq_controller_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -10120,7 +10121,7 @@ index ebb57e97affb..2a03f232a3f2 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10318,11 +10319,11 @@ index ebb57e97affb..2a03f232a3f2 100644
Library("default_neteq_controller_factory_gn")
diff --git third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
-index 96f2fffa5e33..02e6017182d4 100644
+index b1226384d12d..1cc4a9137400 100644
--- third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
+++ third_party/libwebrtc/api/neteq/default_neteq_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -10342,7 +10343,7 @@ index 96f2fffa5e33..02e6017182d4 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10540,11 +10541,11 @@ index 96f2fffa5e33..02e6017182d4 100644
Library("default_neteq_factory_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-index e619d4fb5ab9..b4bd72fd9699 100644
+index 362eb922f20c..3b4f25d48f7a 100644
--- third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -10564,7 +10565,7 @@ index e619d4fb5ab9..b4bd72fd9699 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10758,11 +10759,11 @@ index e619d4fb5ab9..b4bd72fd9699 100644
Library("neteq_api_gn")
diff --git third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-index 9baed43dc5ab..32fc005477ae 100644
+index aec489d12890..2ce3a755ec00 100644
--- third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
+++ third_party/libwebrtc/api/neteq/neteq_controller_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -10782,7 +10783,7 @@ index 9baed43dc5ab..32fc005477ae 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -10903,7 +10904,7 @@ index 9baed43dc5ab..32fc005477ae 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -10956,11 +10957,11 @@ index 9baed43dc5ab..32fc005477ae 100644
-
Library("neteq_controller_api_gn")
diff --git third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-index a0ca1dd76f9a..df6cea066912 100644
+index 3d4c927a3a69..9b7853205ab1 100644
--- third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
+++ third_party/libwebrtc/api/neteq/tick_timer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -10980,7 +10981,7 @@ index a0ca1dd76f9a..df6cea066912 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11167,11 +11168,11 @@ index a0ca1dd76f9a..df6cea066912 100644
Library("tick_timer_gn")
diff --git third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-index 348bf16eecf1..9c5e0ac36215 100644
+index bb63e0bd8fea..4a47582dc2b6 100644
--- third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
+++ third_party/libwebrtc/api/network_state_predictor_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -11191,7 +11192,7 @@ index 348bf16eecf1..9c5e0ac36215 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11301,7 +11302,7 @@ index 348bf16eecf1..9c5e0ac36215 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11354,11 +11355,11 @@ index 348bf16eecf1..9c5e0ac36215 100644
-
Library("network_state_predictor_api_gn")
diff --git third_party/libwebrtc/api/priority_gn/moz.build third_party/libwebrtc/api/priority_gn/moz.build
-index bae63c2cb1cc..81b1938a5747 100644
+index 30d291e65442..d29f4153dd41 100644
--- third_party/libwebrtc/api/priority_gn/moz.build
+++ third_party/libwebrtc/api/priority_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -11378,7 +11379,7 @@ index bae63c2cb1cc..81b1938a5747 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11492,7 +11493,7 @@ index bae63c2cb1cc..81b1938a5747 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11545,11 +11546,11 @@ index bae63c2cb1cc..81b1938a5747 100644
-
Library("priority_gn")
diff --git third_party/libwebrtc/api/ref_count_gn/moz.build third_party/libwebrtc/api/ref_count_gn/moz.build
-index 02086e698dc8..dc07e0f1d07f 100644
+index 2c6650dfce0d..905863936e46 100644
--- third_party/libwebrtc/api/ref_count_gn/moz.build
+++ third_party/libwebrtc/api/ref_count_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -11569,7 +11570,7 @@ index 02086e698dc8..dc07e0f1d07f 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11679,7 +11680,7 @@ index 02086e698dc8..dc07e0f1d07f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11732,11 +11733,11 @@ index 02086e698dc8..dc07e0f1d07f 100644
-
Library("ref_count_gn")
diff --git third_party/libwebrtc/api/refcountedbase_gn/moz.build third_party/libwebrtc/api/refcountedbase_gn/moz.build
-index 52fcc299027f..bc3c0a28cb23 100644
+index b4a1ce1859bd..5a48e0f012c7 100644
--- third_party/libwebrtc/api/refcountedbase_gn/moz.build
+++ third_party/libwebrtc/api/refcountedbase_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -11756,7 +11757,7 @@ index 52fcc299027f..bc3c0a28cb23 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -11866,7 +11867,7 @@ index 52fcc299027f..bc3c0a28cb23 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -11919,11 +11920,11 @@ index 52fcc299027f..bc3c0a28cb23 100644
-
Library("refcountedbase_gn")
diff --git third_party/libwebrtc/api/rtc_error_gn/moz.build third_party/libwebrtc/api/rtc_error_gn/moz.build
-index 236d348fb3da..14dc0fc7363c 100644
+index 90474a271986..56a78ea56e76 100644
--- third_party/libwebrtc/api/rtc_error_gn/moz.build
+++ third_party/libwebrtc/api/rtc_error_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -11943,7 +11944,7 @@ index 236d348fb3da..14dc0fc7363c 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12137,11 +12138,11 @@ index 236d348fb3da..14dc0fc7363c 100644
Library("rtc_error_gn")
diff --git third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-index 711bf9c77efb..729beed1bc12 100644
+index 0b756bd9247e..7ea35cc02aba 100644
--- third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
+++ third_party/libwebrtc/api/rtc_event_log/rtc_event_log_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -12161,7 +12162,7 @@ index 711bf9c77efb..729beed1bc12 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12355,11 +12356,11 @@ index 711bf9c77efb..729beed1bc12 100644
Library("rtc_event_log_gn")
diff --git third_party/libwebrtc/api/rtp_headers_gn/moz.build third_party/libwebrtc/api/rtp_headers_gn/moz.build
-index 41c4e99db55e..8336baf5c775 100644
+index ec592155aca1..eac51ce2434c 100644
--- third_party/libwebrtc/api/rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/rtp_headers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -12379,7 +12380,7 @@ index 41c4e99db55e..8336baf5c775 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12573,11 +12574,11 @@ index 41c4e99db55e..8336baf5c775 100644
Library("rtp_headers_gn")
diff --git third_party/libwebrtc/api/rtp_packet_info_gn/moz.build third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-index 9c1735f23770..49697fe94030 100644
+index 5ee810606cb6..ab05d8ade21a 100644
--- third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
+++ third_party/libwebrtc/api/rtp_packet_info_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -12597,7 +12598,7 @@ index 9c1735f23770..49697fe94030 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12791,11 +12792,11 @@ index 9c1735f23770..49697fe94030 100644
Library("rtp_packet_info_gn")
diff --git third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
-index 0496394c6b64..00fa8cacf263 100644
+index 02fdfc4bf124..c6285735ed40 100644
--- third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
+++ third_party/libwebrtc/api/rtp_packet_sender_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -12815,7 +12816,7 @@ index 0496394c6b64..00fa8cacf263 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -12925,7 +12926,7 @@ index 0496394c6b64..00fa8cacf263 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -12978,11 +12979,11 @@ index 0496394c6b64..00fa8cacf263 100644
-
Library("rtp_packet_sender_gn")
diff --git third_party/libwebrtc/api/rtp_parameters_gn/moz.build third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-index 08553627768d..c163c9cf05b9 100644
+index 238e7c67f128..cf15782a7f00 100644
--- third_party/libwebrtc/api/rtp_parameters_gn/moz.build
+++ third_party/libwebrtc/api/rtp_parameters_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -13002,7 +13003,7 @@ index 08553627768d..c163c9cf05b9 100644
FINAL_LIBRARY = "xul"
-@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13189,11 +13190,11 @@ index 08553627768d..c163c9cf05b9 100644
Library("rtp_parameters_gn")
diff --git third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-index 3b12029bdc36..362c773c7fd2 100644
+index 2a7960aae06e..c12e8eb0b3ef 100644
--- third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
+++ third_party/libwebrtc/api/rtp_sender_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -13213,7 +13214,7 @@ index 3b12029bdc36..362c773c7fd2 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13323,7 +13324,7 @@ index 3b12029bdc36..362c773c7fd2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13376,11 +13377,11 @@ index 3b12029bdc36..362c773c7fd2 100644
-
Library("rtp_sender_interface_gn")
diff --git third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-index cea07d6922c0..ea214198799a 100644
+index 0930cbd84acb..2c0babe074a3 100644
--- third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
+++ third_party/libwebrtc/api/rtp_sender_setparameters_callback_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -13400,7 +13401,7 @@ index cea07d6922c0..ea214198799a 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13594,11 +13595,11 @@ index cea07d6922c0..ea214198799a 100644
Library("rtp_sender_setparameters_callback_gn")
diff --git third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-index b80b352927ed..1090214b4d41 100644
+index 6613c28bb60a..003fe860fd3f 100644
--- third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
+++ third_party/libwebrtc/api/rtp_transceiver_direction_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -13618,7 +13619,7 @@ index b80b352927ed..1090214b4d41 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13728,7 +13729,7 @@ index b80b352927ed..1090214b4d41 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13781,11 +13782,11 @@ index b80b352927ed..1090214b4d41 100644
-
Library("rtp_transceiver_direction_gn")
diff --git third_party/libwebrtc/api/scoped_refptr_gn/moz.build third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-index 562cb4ae55f8..05723cb68f60 100644
+index b2adf5851e86..593dd7ead65b 100644
--- third_party/libwebrtc/api/scoped_refptr_gn/moz.build
+++ third_party/libwebrtc/api/scoped_refptr_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -13805,7 +13806,7 @@ index 562cb4ae55f8..05723cb68f60 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -13915,7 +13916,7 @@ index 562cb4ae55f8..05723cb68f60 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -13968,11 +13969,11 @@ index 562cb4ae55f8..05723cb68f60 100644
-
Library("scoped_refptr_gn")
diff --git third_party/libwebrtc/api/sequence_checker_gn/moz.build third_party/libwebrtc/api/sequence_checker_gn/moz.build
-index 191ccae1f939..42cf01fa9d47 100644
+index 67c1414a8fb4..070132b14c93 100644
--- third_party/libwebrtc/api/sequence_checker_gn/moz.build
+++ third_party/libwebrtc/api/sequence_checker_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -13992,7 +13993,7 @@ index 191ccae1f939..42cf01fa9d47 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14106,7 +14107,7 @@ index 191ccae1f939..42cf01fa9d47 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14159,11 +14160,11 @@ index 191ccae1f939..42cf01fa9d47 100644
-
Library("sequence_checker_gn")
diff --git third_party/libwebrtc/api/simulated_network_api_gn/moz.build third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-index 558f8ca50fda..d5b1312c38f6 100644
+index d01110ffb525..795aecd86879 100644
--- third_party/libwebrtc/api/simulated_network_api_gn/moz.build
+++ third_party/libwebrtc/api/simulated_network_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -14183,7 +14184,7 @@ index 558f8ca50fda..d5b1312c38f6 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14297,7 +14298,7 @@ index 558f8ca50fda..d5b1312c38f6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14350,11 +14351,11 @@ index 558f8ca50fda..d5b1312c38f6 100644
-
Library("simulated_network_api_gn")
diff --git third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
-index 6a4453ac73ee..46673406c667 100644
+index 122718956c48..a4b72e0aadf3 100644
--- third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/default_task_queue_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -14374,7 +14375,7 @@ index 6a4453ac73ee..46673406c667 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14484,7 +14485,7 @@ index 6a4453ac73ee..46673406c667 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -14537,11 +14538,11 @@ index 6a4453ac73ee..46673406c667 100644
-
Library("default_task_queue_factory_gn")
diff --git third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-index beda60da9198..c519cfaeab49 100644
+index 9d8b3cf2f357..6d9600947c8a 100644
--- third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/pending_task_safety_flag_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -14561,7 +14562,7 @@ index beda60da9198..c519cfaeab49 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14748,11 +14749,11 @@ index beda60da9198..c519cfaeab49 100644
Library("pending_task_safety_flag_gn")
diff --git third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-index 3ea55a8b7684..7734743729b9 100644
+index 85ed7df23b34..85068cdc7550 100644
--- third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
+++ third_party/libwebrtc/api/task_queue/task_queue_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -14772,7 +14773,7 @@ index 3ea55a8b7684..7734743729b9 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -14959,11 +14960,11 @@ index 3ea55a8b7684..7734743729b9 100644
Library("task_queue_gn")
diff --git third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
-index 63460f387b3a..3c4c34510df6 100644
+index 21696b67b110..3121ac7a6e59 100644
--- third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bandwidth_estimation_settings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -14983,7 +14984,7 @@ index 63460f387b3a..3c4c34510df6 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15093,7 +15094,7 @@ index 63460f387b3a..3c4c34510df6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15146,11 +15147,11 @@ index 63460f387b3a..3c4c34510df6 100644
-
Library("bandwidth_estimation_settings_gn")
diff --git third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
-index 7e80ecfe46b3..8b2281068103 100644
+index e7882cb5deca..df0954cb00bc 100644
--- third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
+++ third_party/libwebrtc/api/transport/bandwidth_usage_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -15170,7 +15171,7 @@ index 7e80ecfe46b3..8b2281068103 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15280,7 +15281,7 @@ index 7e80ecfe46b3..8b2281068103 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15333,11 +15334,11 @@ index 7e80ecfe46b3..8b2281068103 100644
-
Library("bandwidth_usage_gn")
diff --git third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-index 25a3c741839e..c3027c3972c5 100644
+index 555a10902f49..c58892133406 100644
--- third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
+++ third_party/libwebrtc/api/transport/bitrate_settings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -15357,7 +15358,7 @@ index 25a3c741839e..c3027c3972c5 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15540,11 +15541,11 @@ index 25a3c741839e..c3027c3972c5 100644
Library("bitrate_settings_gn")
diff --git third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-index b11138679c25..19c008c92ffe 100644
+index 8c89cd7e38ad..8c928a5e26a1 100644
--- third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
+++ third_party/libwebrtc/api/transport/datagram_transport_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -15564,7 +15565,7 @@ index b11138679c25..19c008c92ffe 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15685,7 +15686,7 @@ index b11138679c25..19c008c92ffe 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15738,11 +15739,11 @@ index b11138679c25..19c008c92ffe 100644
-
Library("datagram_transport_interface_gn")
diff --git third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
-index 6c4cd224b98b..bc515fc5c103 100644
+index 598652874c2f..b08c4ae86174 100644
--- third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
+++ third_party/libwebrtc/api/transport/ecn_marking_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -15762,7 +15763,7 @@ index 6c4cd224b98b..bc515fc5c103 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -15872,7 +15873,7 @@ index 6c4cd224b98b..bc515fc5c103 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -15925,11 +15926,11 @@ index 6c4cd224b98b..bc515fc5c103 100644
-
Library("ecn_marking_gn")
diff --git third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-index c47158aa87fe..842473731ca0 100644
+index 9105d8e40b27..cba64e004708 100644
--- third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
+++ third_party/libwebrtc/api/transport/field_trial_based_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -15949,7 +15950,7 @@ index c47158aa87fe..842473731ca0 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16143,11 +16144,11 @@ index c47158aa87fe..842473731ca0 100644
Library("field_trial_based_config_gn")
diff --git third_party/libwebrtc/api/transport/goog_cc_gn/moz.build third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-index 89be00e883b4..6e7e204ba661 100644
+index 3118bc006971..a579189ca56f 100644
--- third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
+++ third_party/libwebrtc/api/transport/goog_cc_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -16167,7 +16168,7 @@ index 89be00e883b4..6e7e204ba661 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16366,11 +16367,11 @@ index 89be00e883b4..6e7e204ba661 100644
Library("goog_cc_gn")
diff --git third_party/libwebrtc/api/transport/network_control_gn/moz.build third_party/libwebrtc/api/transport/network_control_gn/moz.build
-index 7ae9e4b54679..d79bb6509222 100644
+index 84054a3f0cfc..0840a4bd7daa 100644
--- third_party/libwebrtc/api/transport/network_control_gn/moz.build
+++ third_party/libwebrtc/api/transport/network_control_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -16390,7 +16391,7 @@ index 7ae9e4b54679..d79bb6509222 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16584,11 +16585,11 @@ index 7ae9e4b54679..d79bb6509222 100644
Library("network_control_gn")
diff --git third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
-index 5c94efb78495..915f17ef72d7 100644
+index a51a68014985..9b4f1222b38e 100644
--- third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/corruption_detection_message_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -16608,7 +16609,7 @@ index 5c94efb78495..915f17ef72d7 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16722,7 +16723,7 @@ index 5c94efb78495..915f17ef72d7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -16775,11 +16776,11 @@ index 5c94efb78495..915f17ef72d7 100644
-
Library("corruption_detection_message_gn")
diff --git third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-index fa5f3fb195e6..a2bad5bb1bca 100644
+index e82fb7517ca6..89beea20aa47 100644
--- third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/dependency_descriptor_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -16799,7 +16800,7 @@ index fa5f3fb195e6..a2bad5bb1bca 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -16986,11 +16987,11 @@ index fa5f3fb195e6..a2bad5bb1bca 100644
Library("dependency_descriptor_gn")
diff --git third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-index 34b4824b5f54..8986e9975515 100644
+index 5b00f221434f..c0eba9314e7c 100644
--- third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
+++ third_party/libwebrtc/api/transport/rtp/rtp_source_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -17010,7 +17011,7 @@ index 34b4824b5f54..8986e9975515 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17131,7 +17132,7 @@ index 34b4824b5f54..8986e9975515 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -17184,11 +17185,11 @@ index 34b4824b5f54..8986e9975515 100644
-
Library("rtp_source_gn")
diff --git third_party/libwebrtc/api/transport/stun_types_gn/moz.build third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-index 865d9643a41c..eb2eea46c3a1 100644
+index ec8b1a8ae39f..ae0e9837c2d7 100644
--- third_party/libwebrtc/api/transport/stun_types_gn/moz.build
+++ third_party/libwebrtc/api/transport/stun_types_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -17208,7 +17209,7 @@ index 865d9643a41c..eb2eea46c3a1 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17318,7 +17319,7 @@ index 865d9643a41c..eb2eea46c3a1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -17371,11 +17372,11 @@ index 865d9643a41c..eb2eea46c3a1 100644
-
Library("stun_types_gn")
diff --git third_party/libwebrtc/api/transport_api_gn/moz.build third_party/libwebrtc/api/transport_api_gn/moz.build
-index 7f3192c2bcfd..d2dee618fe31 100644
+index f62d79097db6..0ca3c18961d0 100644
--- third_party/libwebrtc/api/transport_api_gn/moz.build
+++ third_party/libwebrtc/api/transport_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -17395,7 +17396,7 @@ index 7f3192c2bcfd..d2dee618fe31 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17582,11 +17583,11 @@ index 7f3192c2bcfd..d2dee618fe31 100644
Library("transport_api_gn")
diff --git third_party/libwebrtc/api/units/data_rate_gn/moz.build third_party/libwebrtc/api/units/data_rate_gn/moz.build
-index 720807906a65..40749dda50cc 100644
+index 6543d20d464f..54e7f93d1721 100644
--- third_party/libwebrtc/api/units/data_rate_gn/moz.build
+++ third_party/libwebrtc/api/units/data_rate_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -17606,7 +17607,7 @@ index 720807906a65..40749dda50cc 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -17793,11 +17794,11 @@ index 720807906a65..40749dda50cc 100644
Library("data_rate_gn")
diff --git third_party/libwebrtc/api/units/data_size_gn/moz.build third_party/libwebrtc/api/units/data_size_gn/moz.build
-index 3c005ff583f4..861ba03b8ee4 100644
+index bcc4e35cfcb6..770feb1b06c9 100644
--- third_party/libwebrtc/api/units/data_size_gn/moz.build
+++ third_party/libwebrtc/api/units/data_size_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -17817,7 +17818,7 @@ index 3c005ff583f4..861ba03b8ee4 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18004,11 +18005,11 @@ index 3c005ff583f4..861ba03b8ee4 100644
Library("data_size_gn")
diff --git third_party/libwebrtc/api/units/frequency_gn/moz.build third_party/libwebrtc/api/units/frequency_gn/moz.build
-index 7e1b55def133..df8a867d45be 100644
+index 1da91b84b933..55e3ba9b1169 100644
--- third_party/libwebrtc/api/units/frequency_gn/moz.build
+++ third_party/libwebrtc/api/units/frequency_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -18028,7 +18029,7 @@ index 7e1b55def133..df8a867d45be 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18215,11 +18216,11 @@ index 7e1b55def133..df8a867d45be 100644
Library("frequency_gn")
diff --git third_party/libwebrtc/api/units/time_delta_gn/moz.build third_party/libwebrtc/api/units/time_delta_gn/moz.build
-index aebee68119cb..09ebe7ab3b88 100644
+index 525e75c3d915..e33f5d12403a 100644
--- third_party/libwebrtc/api/units/time_delta_gn/moz.build
+++ third_party/libwebrtc/api/units/time_delta_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -18239,7 +18240,7 @@ index aebee68119cb..09ebe7ab3b88 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18426,11 +18427,11 @@ index aebee68119cb..09ebe7ab3b88 100644
Library("time_delta_gn")
diff --git third_party/libwebrtc/api/units/timestamp_gn/moz.build third_party/libwebrtc/api/units/timestamp_gn/moz.build
-index d80b973f5ee3..7b73258ae847 100644
+index 2a52cfa0984e..9400f8288bad 100644
--- third_party/libwebrtc/api/units/timestamp_gn/moz.build
+++ third_party/libwebrtc/api/units/timestamp_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -18450,7 +18451,7 @@ index d80b973f5ee3..7b73258ae847 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18637,11 +18638,11 @@ index d80b973f5ee3..7b73258ae847 100644
Library("timestamp_gn")
diff --git third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-index a4ec365080f6..383a9f5f8f65 100644
+index d28b32f439c1..7348138c0730 100644
--- third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
+++ third_party/libwebrtc/api/video/builtin_video_bitrate_allocator_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -18661,7 +18662,7 @@ index a4ec365080f6..383a9f5f8f65 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18860,11 +18861,11 @@ index a4ec365080f6..383a9f5f8f65 100644
Library("builtin_video_bitrate_allocator_factory_gn")
diff --git third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
-index 5d7da48cc742..300e8ee3846f 100644
+index 84910bec5b6a..28ddeb5e8675 100644
--- third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
+++ third_party/libwebrtc/api/video/corruption_detection_filter_settings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -18884,7 +18885,7 @@ index 5d7da48cc742..300e8ee3846f 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -18994,7 +18995,7 @@ index 5d7da48cc742..300e8ee3846f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19047,11 +19048,11 @@ index 5d7da48cc742..300e8ee3846f 100644
-
Library("corruption_detection_filter_settings_gn")
diff --git third_party/libwebrtc/api/video/encoded_frame_gn/moz.build third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-index 1727272f7e0f..6ce825420c3d 100644
+index fe7417ed2009..cb2e3e8b1c8c 100644
--- third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_frame_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -19071,7 +19072,7 @@ index 1727272f7e0f..6ce825420c3d 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19265,11 +19266,11 @@ index 1727272f7e0f..6ce825420c3d 100644
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/encoded_image_gn/moz.build third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-index 52b2c556a941..0213de1b0ebb 100644
+index bfdc38c74288..17c35ae9a249 100644
--- third_party/libwebrtc/api/video/encoded_image_gn/moz.build
+++ third_party/libwebrtc/api/video/encoded_image_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -19289,7 +19290,7 @@ index 52b2c556a941..0213de1b0ebb 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19483,11 +19484,11 @@ index 52b2c556a941..0213de1b0ebb 100644
Library("encoded_image_gn")
diff --git third_party/libwebrtc/api/video/frame_buffer_gn/moz.build third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-index 384cb719cb2f..d2f349ceca3b 100644
+index 08a20c36f3b2..588d4beb1a1c 100644
--- third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
+++ third_party/libwebrtc/api/video/frame_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -19507,7 +19508,7 @@ index 384cb719cb2f..d2f349ceca3b 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19706,11 +19707,11 @@ index 384cb719cb2f..d2f349ceca3b 100644
Library("frame_buffer_gn")
diff --git third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-index b0f0ce639337..c56e910a6a20 100644
+index 682afa6b23c6..6dfaf4e483c8 100644
--- third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/recordable_encoded_frame_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -19730,7 +19731,7 @@ index b0f0ce639337..c56e910a6a20 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -19851,7 +19852,7 @@ index b0f0ce639337..c56e910a6a20 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -19904,11 +19905,11 @@ index b0f0ce639337..c56e910a6a20 100644
-
Library("recordable_encoded_frame_gn")
diff --git third_party/libwebrtc/api/video/render_resolution_gn/moz.build third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-index 0af4d7d36209..136648ce930d 100644
+index c572a6cb3edd..57a7f9cbfd11 100644
--- third_party/libwebrtc/api/video/render_resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/render_resolution_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -19928,7 +19929,7 @@ index 0af4d7d36209..136648ce930d 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20038,7 +20039,7 @@ index 0af4d7d36209..136648ce930d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20091,11 +20092,11 @@ index 0af4d7d36209..136648ce930d 100644
-
Library("render_resolution_gn")
diff --git third_party/libwebrtc/api/video/resolution_gn/moz.build third_party/libwebrtc/api/video/resolution_gn/moz.build
-index 74a183e25263..aa69c5c25fd4 100644
+index 8100831c4cc7..9e9cad2d3072 100644
--- third_party/libwebrtc/api/video/resolution_gn/moz.build
+++ third_party/libwebrtc/api/video/resolution_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -20115,7 +20116,7 @@ index 74a183e25263..aa69c5c25fd4 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20225,7 +20226,7 @@ index 74a183e25263..aa69c5c25fd4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20278,11 +20279,11 @@ index 74a183e25263..aa69c5c25fd4 100644
-
Library("resolution_gn")
diff --git third_party/libwebrtc/api/video/video_adaptation_gn/moz.build third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-index cf8c377621aa..5118a4fd59c2 100644
+index ebd41d83934c..047f9d1c5018 100644
--- third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_adaptation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -20302,7 +20303,7 @@ index cf8c377621aa..5118a4fd59c2 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20489,11 +20490,11 @@ index cf8c377621aa..5118a4fd59c2 100644
Library("video_adaptation_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-index 6f16ff5da34f..71b911ecfde6 100644
+index 1b623991d78b..691d665df7ab 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -20513,7 +20514,7 @@ index 6f16ff5da34f..71b911ecfde6 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20700,11 +20701,11 @@ index 6f16ff5da34f..71b911ecfde6 100644
Library("video_bitrate_allocation_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-index 1ff1aaa06a61..77a13b931813 100644
+index 787eece77e9f..0e4eb3564582 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocator_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -20724,7 +20725,7 @@ index 1ff1aaa06a61..77a13b931813 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -20845,7 +20846,7 @@ index 1ff1aaa06a61..77a13b931813 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -20898,11 +20899,11 @@ index 1ff1aaa06a61..77a13b931813 100644
-
Library("video_bitrate_allocator_factory_gn")
diff --git third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-index bd4e602db36e..2280ad344922 100644
+index e3d9aba8ef3c..fcae0009dd68 100644
--- third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/api/video/video_bitrate_allocator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -20922,7 +20923,7 @@ index bd4e602db36e..2280ad344922 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21109,11 +21110,11 @@ index bd4e602db36e..2280ad344922 100644
Library("video_bitrate_allocator_gn")
diff --git third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-index 0b0d1a059d94..bd3794236930 100644
+index 00627f9fe4bf..48f8135282ff 100644
--- third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
+++ third_party/libwebrtc/api/video/video_codec_constants_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -21133,7 +21134,7 @@ index 0b0d1a059d94..bd3794236930 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21243,7 +21244,7 @@ index 0b0d1a059d94..bd3794236930 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -21296,11 +21297,11 @@ index 0b0d1a059d94..bd3794236930 100644
-
Library("video_codec_constants_gn")
diff --git third_party/libwebrtc/api/video/video_frame_gn/moz.build third_party/libwebrtc/api/video/video_frame_gn/moz.build
-index 5c42b97b37a9..7fc4f4ab76f0 100644
+index 4aa343b85d29..d5883b13bee8 100644
--- third_party/libwebrtc/api/video/video_frame_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -21320,7 +21321,7 @@ index 5c42b97b37a9..7fc4f4ab76f0 100644
FINAL_LIBRARY = "xul"
-@@ -54,186 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,186 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21514,11 +21515,11 @@ index 5c42b97b37a9..7fc4f4ab76f0 100644
Library("video_frame_gn")
diff --git third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-index 961ffc81e65b..4cfb3cc01351 100644
+index 4951e4edce85..c4728ecf1200 100644
--- third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_i010_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -21538,7 +21539,7 @@ index 961ffc81e65b..4cfb3cc01351 100644
FINAL_LIBRARY = "xul"
-@@ -50,186 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,186 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21732,11 +21733,11 @@ index 961ffc81e65b..4cfb3cc01351 100644
Library("video_frame_i010_gn")
diff --git third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-index d81fad8e90ec..6f1776416d79 100644
+index e00d025ec821..ef2f74bc0852 100644
--- third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_metadata_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -21756,7 +21757,7 @@ index d81fad8e90ec..6f1776416d79 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -21950,11 +21951,11 @@ index d81fad8e90ec..6f1776416d79 100644
Library("video_frame_metadata_gn")
diff --git third_party/libwebrtc/api/video/video_frame_type_gn/moz.build third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-index 35cbbb6faf29..72dadbd449b5 100644
+index f09aa8024ef8..3569618dc00d 100644
--- third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
+++ third_party/libwebrtc/api/video/video_frame_type_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -21974,7 +21975,7 @@ index 35cbbb6faf29..72dadbd449b5 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22088,7 +22089,7 @@ index 35cbbb6faf29..72dadbd449b5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22141,11 +22142,11 @@ index 35cbbb6faf29..72dadbd449b5 100644
-
Library("video_frame_type_gn")
diff --git third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-index 087e4d2b3b38..00846604156c 100644
+index b9a5bd46571c..de45a2318e42 100644
--- third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
+++ third_party/libwebrtc/api/video/video_layers_allocation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -22165,7 +22166,7 @@ index 087e4d2b3b38..00846604156c 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22279,7 +22280,7 @@ index 087e4d2b3b38..00846604156c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22332,11 +22333,11 @@ index 087e4d2b3b38..00846604156c 100644
-
Library("video_layers_allocation_gn")
diff --git third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-index 9795785a7286..67af495f375a 100644
+index 079848bb358b..0a20b46f6c88 100644
--- third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
+++ third_party/libwebrtc/api/video/video_rtp_headers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -22356,7 +22357,7 @@ index 9795785a7286..67af495f375a 100644
FINAL_LIBRARY = "xul"
-@@ -46,186 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,186 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22550,11 +22551,11 @@ index 9795785a7286..67af495f375a 100644
Library("video_rtp_headers_gn")
diff --git third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-index e35fcc49d5aa..98abab04b82a 100644
+index 5bc79f430bae..1075c82f0415 100644
--- third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
+++ third_party/libwebrtc/api/video/video_stream_encoder_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -22574,7 +22575,7 @@ index e35fcc49d5aa..98abab04b82a 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22695,7 +22696,7 @@ index e35fcc49d5aa..98abab04b82a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22748,11 +22749,11 @@ index e35fcc49d5aa..98abab04b82a 100644
-
Library("video_stream_encoder_gn")
diff --git third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-index 298a78c8a844..b9317d51313f 100644
+index 819a8c287dfc..1282b96a12d0 100644
--- third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/bitstream_parser_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -22772,7 +22773,7 @@ index 298a78c8a844..b9317d51313f 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -22886,7 +22887,7 @@ index 298a78c8a844..b9317d51313f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -22939,11 +22940,11 @@ index 298a78c8a844..b9317d51313f 100644
-
Library("bitstream_parser_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-index e79ca13c7d5b..d4dfd0c7a10b 100644
+index 50fb2e553c51..497c1a3e5ea7 100644
--- third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/builtin_video_decoder_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -22963,7 +22964,7 @@ index e79ca13c7d5b..d4dfd0c7a10b 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23162,11 +23163,11 @@ index e79ca13c7d5b..d4dfd0c7a10b 100644
Library("builtin_video_decoder_factory_gn")
diff --git third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-index f503a3b205df..e50a808f3a90 100644
+index 8336bf0f9eba..9a07248499a2 100644
--- third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/rtc_software_fallback_wrappers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -23186,7 +23187,7 @@ index f503a3b205df..e50a808f3a90 100644
FINAL_LIBRARY = "xul"
-@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23385,11 +23386,11 @@ index f503a3b205df..e50a808f3a90 100644
Library("rtc_software_fallback_wrappers_gn")
diff --git third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-index 15814eeed8b6..7e8b6e8cfa6c 100644
+index 408cb931cfea..527f3b0ba68f 100644
--- third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/scalability_mode_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -23409,7 +23410,7 @@ index 15814eeed8b6..7e8b6e8cfa6c 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23596,11 +23597,11 @@ index 15814eeed8b6..7e8b6e8cfa6c 100644
Library("scalability_mode_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-index 7e065afaab4e..04ad9ac19993 100644
+index 53356c361021..9cef4b9a8a47 100644
--- third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_codecs_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -23620,7 +23621,7 @@ index 7e065afaab4e..04ad9ac19993 100644
FINAL_LIBRARY = "xul"
-@@ -53,186 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,186 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23814,11 +23815,11 @@ index 7e065afaab4e..04ad9ac19993 100644
Library("video_codecs_api_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
-index 5dad1e3674d2..bb5aeb6b5d3d 100644
+index 2daf90b4f83b..ea0857484892 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -23838,7 +23839,7 @@ index 5dad1e3674d2..bb5aeb6b5d3d 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -23959,7 +23960,7 @@ index 5dad1e3674d2..bb5aeb6b5d3d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24012,11 +24013,11 @@ index 5dad1e3674d2..bb5aeb6b5d3d 100644
-
Library("video_encoder_factory_template_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
-index 70cf72d1ea8f..b8e0b45c28a2 100644
+index dfb4ccbb2c51..9231cdb1708f 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libaom_av1_adapter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -24036,7 +24037,7 @@ index 70cf72d1ea8f..b8e0b45c28a2 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24161,7 +24162,7 @@ index 70cf72d1ea8f..b8e0b45c28a2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24214,11 +24215,11 @@ index 70cf72d1ea8f..b8e0b45c28a2 100644
-
Library("video_encoder_factory_template_libaom_av1_adapter_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
-index 5a44aee34808..57f83fc9486b 100644
+index 8f2b2d4c394b..2e032e933f4d 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp8_adapter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -24238,7 +24239,7 @@ index 5a44aee34808..57f83fc9486b 100644
FINAL_LIBRARY = "xul"
-@@ -39,124 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,124 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24364,7 +24365,7 @@ index 5a44aee34808..57f83fc9486b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -167,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24417,11 +24418,11 @@ index 5a44aee34808..57f83fc9486b 100644
-
Library("video_encoder_factory_template_libvpx_vp8_adapter_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
-index 268c7c01b2dd..c0ffd9aab90f 100644
+index 1262d9c963ac..feb340bc6ffa 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_libvpx_vp9_adapter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -24441,7 +24442,7 @@ index 268c7c01b2dd..c0ffd9aab90f 100644
FINAL_LIBRARY = "xul"
-@@ -39,124 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,124 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24567,7 +24568,7 @@ index 268c7c01b2dd..c0ffd9aab90f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -167,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24620,11 +24621,11 @@ index 268c7c01b2dd..c0ffd9aab90f 100644
-
Library("video_encoder_factory_template_libvpx_vp9_adapter_gn")
diff --git third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
-index 3046da6a470f..7237fb0ba38b 100644
+index 37ddca0609eb..50eb54ea4186 100644
--- third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/video_encoder_factory_template_open_h264_adapter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -24644,7 +24645,7 @@ index 3046da6a470f..7237fb0ba38b 100644
FINAL_LIBRARY = "xul"
-@@ -39,124 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,124 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -24770,7 +24771,7 @@ index 3046da6a470f..7237fb0ba38b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -167,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -24823,11 +24824,11 @@ index 3046da6a470f..7237fb0ba38b 100644
-
Library("video_encoder_factory_template_open_h264_adapter_gn")
diff --git third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-index 487c0d9471e1..2fe2304cb942 100644
+index ebc185abb114..3b7a135fe174 100644
--- third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
+++ third_party/libwebrtc/api/video_codecs/vp8_temporal_layers_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -24847,7 +24848,7 @@ index 487c0d9471e1..2fe2304cb942 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25046,11 +25047,11 @@ index 487c0d9471e1..2fe2304cb942 100644
Library("vp8_temporal_layers_factory_gn")
diff --git third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-index eed553ce968c..a9bb083e07d3 100644
+index 933524efdac5..7ec1ae1523bd 100644
--- third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
+++ third_party/libwebrtc/api/video_track_source_constraints_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -25070,7 +25071,7 @@ index eed553ce968c..a9bb083e07d3 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25180,7 +25181,7 @@ index eed553ce968c..a9bb083e07d3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -25233,11 +25234,11 @@ index eed553ce968c..a9bb083e07d3 100644
-
Library("video_track_source_constraints_gn")
diff --git third_party/libwebrtc/audio/audio_gn/moz.build third_party/libwebrtc/audio/audio_gn/moz.build
-index c52d2d8ec5d5..570c4597d2ab 100644
+index 1e33a79591e5..1423654999b3 100644
--- third_party/libwebrtc/audio/audio_gn/moz.build
+++ third_party/libwebrtc/audio/audio_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -25257,7 +25258,7 @@ index c52d2d8ec5d5..570c4597d2ab 100644
FINAL_LIBRARY = "xul"
-@@ -55,191 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,191 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25456,11 +25457,11 @@ index c52d2d8ec5d5..570c4597d2ab 100644
Library("audio_gn")
diff --git third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-index 41ec2166f76b..80914acd5839 100644
+index a072faa0e703..b021c5c974d6 100644
--- third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
+++ third_party/libwebrtc/audio/utility/audio_frame_operations_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -25480,7 +25481,7 @@ index 41ec2166f76b..80914acd5839 100644
FINAL_LIBRARY = "xul"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25678,11 +25679,11 @@ index 41ec2166f76b..80914acd5839 100644
Library("audio_frame_operations_gn")
diff --git third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-index b47b7f67124e..0115d47e0857 100644
+index a16854c0cbf3..10c7a4ac89a7 100644
--- third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
+++ third_party/libwebrtc/call/adaptation/resource_adaptation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -25702,7 +25703,7 @@ index b47b7f67124e..0115d47e0857 100644
FINAL_LIBRARY = "xul"
-@@ -52,191 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,191 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -25901,11 +25902,11 @@ index b47b7f67124e..0115d47e0857 100644
Library("resource_adaptation_gn")
diff --git third_party/libwebrtc/call/audio_sender_interface_gn/moz.build third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-index 64613d5febf2..1e65cb180fd1 100644
+index 24568a31a210..e88cc584182f 100644
--- third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
+++ third_party/libwebrtc/call/audio_sender_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -25925,7 +25926,7 @@ index 64613d5febf2..1e65cb180fd1 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26046,7 +26047,7 @@ index 64613d5febf2..1e65cb180fd1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -26099,11 +26100,11 @@ index 64613d5febf2..1e65cb180fd1 100644
-
Library("audio_sender_interface_gn")
diff --git third_party/libwebrtc/call/bitrate_allocator_gn/moz.build third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-index f881adeec2c7..0f207f759b9d 100644
+index ca42c673672b..a9b6fcefbad9 100644
--- third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_allocator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -26123,7 +26124,7 @@ index f881adeec2c7..0f207f759b9d 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26321,11 +26322,11 @@ index f881adeec2c7..0f207f759b9d 100644
Library("bitrate_allocator_gn")
diff --git third_party/libwebrtc/call/bitrate_configurator_gn/moz.build third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-index 1c8d60c87c7d..9d7cd391892f 100644
+index 2d0f74ea355e..b2182b8b5ce4 100644
--- third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
+++ third_party/libwebrtc/call/bitrate_configurator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -26345,7 +26346,7 @@ index 1c8d60c87c7d..9d7cd391892f 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26543,11 +26544,11 @@ index 1c8d60c87c7d..9d7cd391892f 100644
Library("bitrate_configurator_gn")
diff --git third_party/libwebrtc/call/call_gn/moz.build third_party/libwebrtc/call/call_gn/moz.build
-index 554f25cfb490..b1723ba1715c 100644
+index 987aff418d68..38c79be10cdc 100644
--- third_party/libwebrtc/call/call_gn/moz.build
+++ third_party/libwebrtc/call/call_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -26567,7 +26568,7 @@ index 554f25cfb490..b1723ba1715c 100644
FINAL_LIBRARY = "xul"
-@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26766,11 +26767,11 @@ index 554f25cfb490..b1723ba1715c 100644
Library("call_gn")
diff --git third_party/libwebrtc/call/call_interfaces_gn/moz.build third_party/libwebrtc/call/call_interfaces_gn/moz.build
-index 01a07308c01b..1f5bb9bae089 100644
+index 3147c1e5f11a..485e219e783d 100644
--- third_party/libwebrtc/call/call_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/call_interfaces_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -26790,7 +26791,7 @@ index 01a07308c01b..1f5bb9bae089 100644
FINAL_LIBRARY = "xul"
-@@ -49,191 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,191 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -26989,11 +26990,11 @@ index 01a07308c01b..1f5bb9bae089 100644
Library("call_interfaces_gn")
diff --git third_party/libwebrtc/call/payload_type_gn/moz.build third_party/libwebrtc/call/payload_type_gn/moz.build
-index 4ee6afa8af43..a56032559c58 100644
+index 373d925f861d..101b856cff86 100644
--- third_party/libwebrtc/call/payload_type_gn/moz.build
+++ third_party/libwebrtc/call/payload_type_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -27013,7 +27014,7 @@ index 4ee6afa8af43..a56032559c58 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27134,7 +27135,7 @@ index 4ee6afa8af43..a56032559c58 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -27187,11 +27188,11 @@ index 4ee6afa8af43..a56032559c58 100644
-
Library("payload_type_gn")
diff --git third_party/libwebrtc/call/payload_type_picker_gn/moz.build third_party/libwebrtc/call/payload_type_picker_gn/moz.build
-index 9882d5dcd22c..7c7bf3c21180 100644
+index f6525a6416ce..3c2fd78fd486 100644
--- third_party/libwebrtc/call/payload_type_picker_gn/moz.build
+++ third_party/libwebrtc/call/payload_type_picker_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -27211,7 +27212,7 @@ index 9882d5dcd22c..7c7bf3c21180 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27405,11 +27406,11 @@ index 9882d5dcd22c..7c7bf3c21180 100644
Library("payload_type_picker_gn")
diff --git third_party/libwebrtc/call/receive_stream_interface_gn/moz.build third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-index c7fa9954fd8a..19c896a21aa4 100644
+index 67bf072556e5..6c2b07cf373d 100644
--- third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
+++ third_party/libwebrtc/call/receive_stream_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -27429,7 +27430,7 @@ index c7fa9954fd8a..19c896a21aa4 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27554,7 +27555,7 @@ index c7fa9954fd8a..19c896a21aa4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -27607,11 +27608,11 @@ index c7fa9954fd8a..19c896a21aa4 100644
-
Library("receive_stream_interface_gn")
diff --git third_party/libwebrtc/call/rtp_interfaces_gn/moz.build third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-index 6fb2e359fbd9..20ac430288cf 100644
+index 5204bc7ce3ea..ee28e9bcacc4 100644
--- third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
+++ third_party/libwebrtc/call/rtp_interfaces_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -27631,7 +27632,7 @@ index 6fb2e359fbd9..20ac430288cf 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -27829,11 +27830,11 @@ index 6fb2e359fbd9..20ac430288cf 100644
Library("rtp_interfaces_gn")
diff --git third_party/libwebrtc/call/rtp_receiver_gn/moz.build third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-index 2541c2cae1b1..824177307e7b 100644
+index c38e16384766..ce6c252179bd 100644
--- third_party/libwebrtc/call/rtp_receiver_gn/moz.build
+++ third_party/libwebrtc/call/rtp_receiver_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -27853,7 +27854,7 @@ index 2541c2cae1b1..824177307e7b 100644
FINAL_LIBRARY = "xul"
-@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28052,11 +28053,11 @@ index 2541c2cae1b1..824177307e7b 100644
Library("rtp_receiver_gn")
diff --git third_party/libwebrtc/call/rtp_sender_gn/moz.build third_party/libwebrtc/call/rtp_sender_gn/moz.build
-index aa3c0bba6685..399904c3e24e 100644
+index 5290b5209c1d..5fe9f7707ed5 100644
--- third_party/libwebrtc/call/rtp_sender_gn/moz.build
+++ third_party/libwebrtc/call/rtp_sender_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -28076,7 +28077,7 @@ index aa3c0bba6685..399904c3e24e 100644
FINAL_LIBRARY = "xul"
-@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,191 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28275,11 +28276,11 @@ index aa3c0bba6685..399904c3e24e 100644
Library("rtp_sender_gn")
diff --git third_party/libwebrtc/call/version_gn/moz.build third_party/libwebrtc/call/version_gn/moz.build
-index e7398c80eac7..4eec2fd5233b 100644
+index 96da557651b8..d51b86338e8c 100644
--- third_party/libwebrtc/call/version_gn/moz.build
+++ third_party/libwebrtc/call/version_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -28299,7 +28300,7 @@ index e7398c80eac7..4eec2fd5233b 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28482,11 +28483,11 @@ index e7398c80eac7..4eec2fd5233b 100644
Library("version_gn")
diff --git third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
-index 51f7c9ac299d..f5eea9cb37bc 100644
+index a8f4e7feca35..22dc8ac49790 100644
--- third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
+++ third_party/libwebrtc/call/video_receive_stream_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -28506,7 +28507,7 @@ index 51f7c9ac299d..f5eea9cb37bc 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28704,11 +28705,11 @@ index 51f7c9ac299d..f5eea9cb37bc 100644
Library("video_receive_stream_api_gn")
diff --git third_party/libwebrtc/call/video_send_stream_api_gn/moz.build third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
-index 0742e20b1bd4..f509a3a7a968 100644
+index e61cdfdf0b7f..f7955154d619 100644
--- third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
+++ third_party/libwebrtc/call/video_send_stream_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -28728,7 +28729,7 @@ index 0742e20b1bd4..f509a3a7a968 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -28926,11 +28927,11 @@ index 0742e20b1bd4..f509a3a7a968 100644
Library("video_send_stream_api_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-index 4c10d5cbee0e..8ba51fa2944b 100644
+index 1d91ddd6d2db..d4119282e31e 100644
--- third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_avx2_gn/moz.build
-@@ -17,12 +17,21 @@ CXXFLAGS += [
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,12 +18,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -28951,7 +28952,7 @@ index 4c10d5cbee0e..8ba51fa2944b 100644
FINAL_LIBRARY = "xul"
-@@ -50,134 +59,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,134 +60,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29090,11 +29091,11 @@ index 4c10d5cbee0e..8ba51fa2944b 100644
Library("common_audio_avx2_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-index 0707d29fb62f..76bf1b4c5a97 100644
+index f7215df5b93f..ca8a3e39e485 100644
--- third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_arm_asm_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -29114,7 +29115,7 @@ index 0707d29fb62f..76bf1b4c5a97 100644
FINAL_LIBRARY = "xul"
-@@ -39,113 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,113 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29229,7 +29230,7 @@ index 0707d29fb62f..76bf1b4c5a97 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -155,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -156,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -29282,11 +29283,11 @@ index 0707d29fb62f..76bf1b4c5a97 100644
-
Library("common_audio_c_arm_asm_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-index d3ade0886cb0..1c75c3e95d87 100644
+index 48b33b0a39e0..df61b43a1494 100644
--- third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_c_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -29306,7 +29307,7 @@ index d3ade0886cb0..1c75c3e95d87 100644
FINAL_LIBRARY = "xul"
-@@ -80,114 +89,12 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -81,114 +90,12 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29425,7 +29426,7 @@ index d3ade0886cb0..1c75c3e95d87 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -195,25 +102,8 @@ if CONFIG["OS_TARGET"] == "WINNT":
+@@ -196,25 +103,8 @@ if CONFIG["OS_TARGET"] == "WINNT":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -29451,7 +29452,7 @@ index d3ade0886cb0..1c75c3e95d87 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
"/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -224,7 +114,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -225,7 +115,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
@@ -29459,7 +29460,7 @@ index d3ade0886cb0..1c75c3e95d87 100644
SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/resample_by_2_mips.c"
-@@ -241,8 +130,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -242,8 +131,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
if CONFIG["TARGET_CPU"] == "mips64":
@@ -29468,7 +29469,7 @@ index d3ade0886cb0..1c75c3e95d87 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
"/third_party/libwebrtc/common_audio/signal_processing/complex_fft.c",
-@@ -257,88 +144,21 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -258,88 +145,21 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -29561,7 +29562,7 @@ index d3ade0886cb0..1c75c3e95d87 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -346,13 +166,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
+@@ -347,13 +167,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "riscv64":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -29577,7 +29578,7 @@ index d3ade0886cb0..1c75c3e95d87 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/signal_processing/complex_bit_reverse.c",
-@@ -360,14 +176,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -361,14 +177,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/common_audio/signal_processing/filter_ar_fast_q12.c"
]
@@ -29595,11 +29596,11 @@ index d3ade0886cb0..1c75c3e95d87 100644
Library("common_audio_c_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-index c023b7c150b1..b4d70cc2f54e 100644
+index 53b9acf53b42..f32a57a8e243 100644
--- third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_cc_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -29619,7 +29620,7 @@ index c023b7c150b1..b4d70cc2f54e 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -29817,11 +29818,11 @@ index c023b7c150b1..b4d70cc2f54e 100644
Library("common_audio_cc_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_gn/moz.build third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-index 8a6ffa09aba0..3b2da1e0df87 100644
+index 8c05ef9ae01e..596e68a80c5e 100644
--- third_party/libwebrtc/common_audio/common_audio_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -29841,7 +29842,7 @@ index 8a6ffa09aba0..3b2da1e0df87 100644
FINAL_LIBRARY = "xul"
-@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,190 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30039,11 +30040,11 @@ index 8a6ffa09aba0..3b2da1e0df87 100644
Library("common_audio_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-index 483307d5a1b8..cd818499ef51 100644
+index 057bf1e05f30..74c0edfc8065 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_c_gn/moz.build
-@@ -12,12 +12,22 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -30065,7 +30066,7 @@ index 483307d5a1b8..cd818499ef51 100644
FINAL_LIBRARY = "xul"
-@@ -46,148 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,148 +57,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30216,11 +30217,11 @@ index 483307d5a1b8..cd818499ef51 100644
-
Library("common_audio_neon_c_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-index ef49252d158c..3986bf338e26 100644
+index 4ba3abd64cc9..4a9a332ee3a7 100644
--- third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_neon_gn/moz.build
-@@ -12,12 +12,22 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -30242,7 +30243,7 @@ index ef49252d158c..3986bf338e26 100644
FINAL_LIBRARY = "xul"
-@@ -45,148 +55,10 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,148 +56,10 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30393,11 +30394,11 @@ index ef49252d158c..3986bf338e26 100644
-
Library("common_audio_neon_gn")
diff --git third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-index 51912d444a2a..3cbf748ca212 100644
+index 9b0cc3b2530f..a4234c50a2c4 100644
--- third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
+++ third_party/libwebrtc/common_audio/common_audio_sse2_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -30418,7 +30419,7 @@ index 51912d444a2a..3cbf748ca212 100644
FINAL_LIBRARY = "xul"
-@@ -45,156 +54,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,156 +55,23 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30580,11 +30581,11 @@ index 51912d444a2a..3cbf748ca212 100644
Library("common_audio_sse2_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-index 2e171bb7a6e1..2e23cff0927c 100644
+index 3f6e7760f9ea..d92a68b35e06 100644
--- third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -30604,7 +30605,7 @@ index 2e171bb7a6e1..2e23cff0927c 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30802,11 +30803,11 @@ index 2e171bb7a6e1..2e23cff0927c 100644
Library("fir_filter_factory_gn")
diff --git third_party/libwebrtc/common_audio/fir_filter_gn/moz.build third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-index 5ecdb1c5a628..1c7ccb98989b 100644
+index faa0a79081cd..ae16a06d7d3a 100644
--- third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
+++ third_party/libwebrtc/common_audio/fir_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -30826,7 +30827,7 @@ index 5ecdb1c5a628..1c7ccb98989b 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -30936,7 +30937,7 @@ index 5ecdb1c5a628..1c7ccb98989b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -30989,11 +30990,11 @@ index 5ecdb1c5a628..1c7ccb98989b 100644
-
Library("fir_filter_gn")
diff --git third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-index 7119bb2e4faf..2ddc2629d15a 100644
+index d9cf6ef8d1e3..cff33184ac39 100644
--- third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
+++ third_party/libwebrtc/common_audio/sinc_resampler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -31013,7 +31014,7 @@ index 7119bb2e4faf..2ddc2629d15a 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31138,7 +31139,7 @@ index 7119bb2e4faf..2ddc2629d15a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -31191,11 +31192,11 @@ index 7119bb2e4faf..2ddc2629d15a 100644
-
Library("sinc_resampler_gn")
diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-index 61b2490a0073..94878277903b 100644
+index 5d0978fcf8ce..ba66d5de064e 100644
--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -31215,7 +31216,7 @@ index 61b2490a0073..94878277903b 100644
FINAL_LIBRARY = "xul"
-@@ -43,98 +52,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,98 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31315,7 +31316,7 @@ index 61b2490a0073..94878277903b 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -145,132 +63,42 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -146,132 +64,42 @@ if CONFIG["TARGET_CPU"] == "aarch64":
"/third_party/libwebrtc/common_audio/third_party/ooura/fft_size_128/ooura_fft_neon.cc"
]
@@ -31458,11 +31459,11 @@ index 61b2490a0073..94878277903b 100644
Library("fft_size_128_gn")
diff --git third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-index 78925ad820e1..93632857ca94 100644
+index abbf58c8e6e1..c8156058abd1 100644
--- third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/ooura/fft_size_256_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -31482,7 +31483,7 @@ index 78925ad820e1..93632857ca94 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31665,11 +31666,11 @@ index 78925ad820e1..93632857ca94 100644
Library("fft_size_256_gn")
diff --git third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-index a6269cbd5a3f..7c59eb325f1f 100644
+index e0887017963d..84d5c6e4a8cb 100644
--- third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
+++ third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -31689,7 +31690,7 @@ index a6269cbd5a3f..7c59eb325f1f 100644
FINAL_LIBRARY = "xul"
-@@ -39,115 +48,19 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,115 +49,19 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -31808,7 +31809,7 @@ index a6269cbd5a3f..7c59eb325f1f 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
-@@ -156,7 +69,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -157,7 +70,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
@@ -31816,7 +31817,7 @@ index a6269cbd5a3f..7c59eb325f1f 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor_mips.c"
-@@ -164,8 +76,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -165,8 +77,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
if CONFIG["TARGET_CPU"] == "mips64":
@@ -31825,7 +31826,7 @@ index a6269cbd5a3f..7c59eb325f1f 100644
UNIFIED_SOURCES += [
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
-@@ -176,102 +86,34 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -177,102 +87,34 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/common_audio/third_party/spl_sqrt_floor/spl_sqrt_floor.c"
]
@@ -31936,11 +31937,11 @@ index a6269cbd5a3f..7c59eb325f1f 100644
Library("spl_sqrt_floor_gn")
diff --git third_party/libwebrtc/common_video/common_video_gn/moz.build third_party/libwebrtc/common_video/common_video_gn/moz.build
-index cb40e064282d..611b579b4f25 100644
+index 85b1d6e3876a..b94189d3545a 100644
--- third_party/libwebrtc/common_video/common_video_gn/moz.build
+++ third_party/libwebrtc/common_video/common_video_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -31960,7 +31961,7 @@ index cb40e064282d..611b579b4f25 100644
FINAL_LIBRARY = "xul"
-@@ -55,186 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,186 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32154,11 +32155,11 @@ index cb40e064282d..611b579b4f25 100644
Library("common_video_gn")
diff --git third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
-index 9cb9225a87fc..0db4ddb79920 100644
+index 9944edddcfc7..dab4c0cf2af3 100644
--- third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
+++ third_party/libwebrtc/common_video/corruption_detection_converters_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -32178,7 +32179,7 @@ index 9cb9225a87fc..0db4ddb79920 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32365,11 +32366,11 @@ index 9cb9225a87fc..0db4ddb79920 100644
Library("corruption_detection_converters_gn")
diff --git third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
-index fc3bafbb64b4..7581bd78b6c5 100644
+index fca1c9f668b8..96e6cd2de3f4 100644
--- third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
+++ third_party/libwebrtc/common_video/corruption_score_calculator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -32389,7 +32390,7 @@ index fc3bafbb64b4..7581bd78b6c5 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32510,7 +32511,7 @@ index fc3bafbb64b4..7581bd78b6c5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32563,11 +32564,11 @@ index fc3bafbb64b4..7581bd78b6c5 100644
-
Library("corruption_score_calculator_gn")
diff --git third_party/libwebrtc/common_video/frame_counts_gn/moz.build third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-index 8fc0726fff58..9a2f65ea66c5 100644
+index 79118636ef57..a240d297e534 100644
--- third_party/libwebrtc/common_video/frame_counts_gn/moz.build
+++ third_party/libwebrtc/common_video/frame_counts_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -32587,7 +32588,7 @@ index 8fc0726fff58..9a2f65ea66c5 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32697,7 +32698,7 @@ index 8fc0726fff58..9a2f65ea66c5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32750,11 +32751,11 @@ index 8fc0726fff58..9a2f65ea66c5 100644
-
Library("frame_counts_gn")
diff --git third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
-index 6f415251ad95..2e666f70cf8c 100644
+index ad826406041d..9a33fa9b8af1 100644
--- third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
+++ third_party/libwebrtc/common_video/frame_instrumentation_data_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -32774,7 +32775,7 @@ index 6f415251ad95..2e666f70cf8c 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -32884,7 +32885,7 @@ index 6f415251ad95..2e666f70cf8c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -32937,11 +32938,11 @@ index 6f415251ad95..2e666f70cf8c 100644
-
Library("frame_instrumentation_data_gn")
diff --git third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-index d36cf57dacd5..7652e895de75 100644
+index 41c302c40bdf..faf1b8af307c 100644
--- third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
+++ third_party/libwebrtc/common_video/generic_frame_descriptor/generic_frame_descriptor_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -32961,7 +32962,7 @@ index d36cf57dacd5..7652e895de75 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33148,11 +33149,11 @@ index d36cf57dacd5..7652e895de75 100644
Library("generic_frame_descriptor_gn")
diff --git third_party/libwebrtc/dcsctp_gn/moz.build third_party/libwebrtc/dcsctp_gn/moz.build
-index 2f940fd7bec3..b555230e9bce 100644
+index d257f1ad2fa8..b3b3098adf87 100644
--- third_party/libwebrtc/dcsctp_gn/moz.build
+++ third_party/libwebrtc/dcsctp_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -33172,7 +33173,7 @@ index 2f940fd7bec3..b555230e9bce 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33293,7 +33294,7 @@ index 2f940fd7bec3..b555230e9bce 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -33346,11 +33347,11 @@ index 2f940fd7bec3..b555230e9bce 100644
-
Library("dcsctp_gn")
diff --git third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-index 216472255063..679a78a96f89 100644
+index d145d0ea9376..c46ee2a6426e 100644
--- third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
+++ third_party/libwebrtc/experiments/registered_field_trials_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -33370,7 +33371,7 @@ index 216472255063..679a78a96f89 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33480,7 +33481,7 @@ index 216472255063..679a78a96f89 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -33547,11 +33548,11 @@ index 6c29dea76a50..3ae54a950c46 100644
-
Library("registered_field_trials_header_gn")
diff --git third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-index a6629977f400..0da1f97cbafd 100644
+index 87c1d54c4df1..1de0302ecc91 100644
--- third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_audio_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -33571,7 +33572,7 @@ index a6629977f400..0da1f97cbafd 100644
FINAL_LIBRARY = "xul"
-@@ -47,186 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,186 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33765,11 +33766,11 @@ index a6629977f400..0da1f97cbafd 100644
Library("rtc_event_audio_gn")
diff --git third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-index f5dbb588ce9d..aca9e63b106b 100644
+index 7abe0e6ab8f6..c00986cd7d3f 100644
--- third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_bwe_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -33789,7 +33790,7 @@ index f5dbb588ce9d..aca9e63b106b 100644
FINAL_LIBRARY = "xul"
-@@ -48,186 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,186 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -33983,11 +33984,11 @@ index f5dbb588ce9d..aca9e63b106b 100644
Library("rtc_event_bwe_gn")
diff --git third_party/libwebrtc/logging/rtc_event_field_gn/moz.build third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-index f121198a0800..4a8b29c731a2 100644
+index 173a4af52ed4..f49361ea7deb 100644
--- third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_field_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -34007,7 +34008,7 @@ index f121198a0800..4a8b29c731a2 100644
FINAL_LIBRARY = "xul"
-@@ -46,186 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,186 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34201,11 +34202,11 @@ index f121198a0800..4a8b29c731a2 100644
Library("rtc_event_field_gn")
diff --git third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
-index 2348f29e3310..7288ed35abad 100644
+index 988db900c124..58ac771f6db7 100644
--- third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_log_parse_status_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -34225,7 +34226,7 @@ index 2348f29e3310..7288ed35abad 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34339,7 +34340,7 @@ index 2348f29e3310..7288ed35abad 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -34392,11 +34393,11 @@ index 2348f29e3310..7288ed35abad 100644
-
Library("rtc_event_log_parse_status_gn")
diff --git third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-index 524cb78d4918..ee2f0cd421d7 100644
+index eb57df474228..3feab91a7084 100644
--- third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_number_encodings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -34416,7 +34417,7 @@ index 524cb78d4918..ee2f0cd421d7 100644
FINAL_LIBRARY = "xul"
-@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,179 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34603,11 +34604,11 @@ index 524cb78d4918..ee2f0cd421d7 100644
Library("rtc_event_number_encodings_gn")
diff --git third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-index 6dc6484494da..824c9abdf3d0 100644
+index 46192e21f4e7..c9d38230adf6 100644
--- third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_pacing_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -34627,7 +34628,7 @@ index 6dc6484494da..824c9abdf3d0 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -34821,11 +34822,11 @@ index 6dc6484494da..824c9abdf3d0 100644
Library("rtc_event_pacing_gn")
diff --git third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-index 8cc1177e82ef..0ba912e5dbeb 100644
+index db532092f5ba..973cc40e2eb7 100644
--- third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_rtp_rtcp_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -34845,7 +34846,7 @@ index 8cc1177e82ef..0ba912e5dbeb 100644
FINAL_LIBRARY = "xul"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35043,11 +35044,11 @@ index 8cc1177e82ef..0ba912e5dbeb 100644
Library("rtc_event_rtp_rtcp_gn")
diff --git third_party/libwebrtc/logging/rtc_event_video_gn/moz.build third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-index 3f8e25f66cf1..5dfce62b3b3e 100644
+index 880219f21c25..bc58f4335961 100644
--- third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_event_video_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -35067,7 +35068,7 @@ index 3f8e25f66cf1..5dfce62b3b3e 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35261,11 +35262,11 @@ index 3f8e25f66cf1..5dfce62b3b3e 100644
Library("rtc_event_video_gn")
diff --git third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-index 604a99340ea1..abd1c123b85a 100644
+index 71ec6e58eab4..98496cf6ad3d 100644
--- third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
+++ third_party/libwebrtc/logging/rtc_stream_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -35285,7 +35286,7 @@ index 604a99340ea1..abd1c123b85a 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35479,11 +35480,11 @@ index 604a99340ea1..abd1c123b85a 100644
Library("rtc_stream_config_gn")
diff --git third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
-index 9cd35674dc77..bdfcd97c39a7 100644
+index fc9a05fecbd7..f730e651788a 100644
--- third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
+++ third_party/libwebrtc/media/adapted_video_track_source_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -35503,7 +35504,7 @@ index 9cd35674dc77..bdfcd97c39a7 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35697,11 +35698,11 @@ index 9cd35674dc77..bdfcd97c39a7 100644
Library("adapted_video_track_source_gn")
diff --git third_party/libwebrtc/media/audio_source_gn/moz.build third_party/libwebrtc/media/audio_source_gn/moz.build
-index 1241f267c6b3..c62c06c2e274 100644
+index b3ffa731b047..556c37a94cdd 100644
--- third_party/libwebrtc/media/audio_source_gn/moz.build
+++ third_party/libwebrtc/media/audio_source_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -35721,7 +35722,7 @@ index 1241f267c6b3..c62c06c2e274 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -35831,7 +35832,7 @@ index 1241f267c6b3..c62c06c2e274 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -35884,11 +35885,11 @@ index 1241f267c6b3..c62c06c2e274 100644
-
Library("audio_source_gn")
diff --git third_party/libwebrtc/media/codec_gn/moz.build third_party/libwebrtc/media/codec_gn/moz.build
-index 51c9e2fdf274..6123ce9afcd7 100644
+index fa1c367755e9..073728d67c50 100644
--- third_party/libwebrtc/media/codec_gn/moz.build
+++ third_party/libwebrtc/media/codec_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -35908,7 +35909,7 @@ index 51c9e2fdf274..6123ce9afcd7 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36102,11 +36103,11 @@ index 51c9e2fdf274..6123ce9afcd7 100644
Library("codec_gn")
diff --git third_party/libwebrtc/media/media_channel_gn/moz.build third_party/libwebrtc/media/media_channel_gn/moz.build
-index 948e34ca808b..2b0ddb90290f 100644
+index 50c9885138f8..16e5ba4ee32e 100644
--- third_party/libwebrtc/media/media_channel_gn/moz.build
+++ third_party/libwebrtc/media/media_channel_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -36126,7 +36127,7 @@ index 948e34ca808b..2b0ddb90290f 100644
FINAL_LIBRARY = "xul"
-@@ -39,124 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,124 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36252,7 +36253,7 @@ index 948e34ca808b..2b0ddb90290f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -167,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36305,11 +36306,11 @@ index 948e34ca808b..2b0ddb90290f 100644
-
Library("media_channel_gn")
diff --git third_party/libwebrtc/media/media_channel_impl_gn/moz.build third_party/libwebrtc/media/media_channel_impl_gn/moz.build
-index fc55532a8011..52f88e43cc57 100644
+index 5e6822d5bdc0..400eab1bee62 100644
--- third_party/libwebrtc/media/media_channel_impl_gn/moz.build
+++ third_party/libwebrtc/media/media_channel_impl_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -36329,7 +36330,7 @@ index fc55532a8011..52f88e43cc57 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36439,7 +36440,7 @@ index fc55532a8011..52f88e43cc57 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36492,11 +36493,11 @@ index fc55532a8011..52f88e43cc57 100644
-
Library("media_channel_impl_gn")
diff --git third_party/libwebrtc/media/media_constants_gn/moz.build third_party/libwebrtc/media/media_constants_gn/moz.build
-index 513ae136c7c4..423d08736d64 100644
+index 38e1075093fa..1dda12f2a71d 100644
--- third_party/libwebrtc/media/media_constants_gn/moz.build
+++ third_party/libwebrtc/media/media_constants_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -36516,7 +36517,7 @@ index 513ae136c7c4..423d08736d64 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36699,11 +36700,11 @@ index 513ae136c7c4..423d08736d64 100644
Library("media_constants_gn")
diff --git third_party/libwebrtc/media/media_engine_gn/moz.build third_party/libwebrtc/media/media_engine_gn/moz.build
-index f2f90903dcce..5c5db0c2817b 100644
+index 20c2853bfc82..696f3b2819c5 100644
--- third_party/libwebrtc/media/media_engine_gn/moz.build
+++ third_party/libwebrtc/media/media_engine_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -36723,7 +36724,7 @@ index f2f90903dcce..5c5db0c2817b 100644
FINAL_LIBRARY = "xul"
-@@ -39,124 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,124 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36849,7 +36850,7 @@ index f2f90903dcce..5c5db0c2817b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -167,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -36902,11 +36903,11 @@ index f2f90903dcce..5c5db0c2817b 100644
-
Library("media_engine_gn")
diff --git third_party/libwebrtc/media/rid_description_gn/moz.build third_party/libwebrtc/media/rid_description_gn/moz.build
-index 1985b87ded83..cc43c08f4956 100644
+index 92aa0430434d..6fae71d28c23 100644
--- third_party/libwebrtc/media/rid_description_gn/moz.build
+++ third_party/libwebrtc/media/rid_description_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -36926,7 +36927,7 @@ index 1985b87ded83..cc43c08f4956 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -36944,6 +36945,10 @@ index 1985b87ded83..cc43c08f4956 100644
- DEFINES["__STDC_CONSTANT_MACROS"] = True
- DEFINES["__STDC_FORMAT_MACROS"] = True
-
+- OS_LIBS += [
+- "log"
+- ]
+-
-if CONFIG["OS_TARGET"] == "Darwin":
-
- DEFINES["WEBRTC_MAC"] = True
@@ -37007,6 +37012,13 @@ index 1985b87ded83..cc43c08f4956 100644
- DEFINES["_WIN32_WINNT"] = "0x0A00"
- DEFINES["_WINDOWS"] = True
- DEFINES["__STD_C"] = True
+-
+- OS_LIBS += [
+- "crypt32",
+- "iphlpapi",
+- "secur32",
+- "winmm"
+- ]
+ DEFINES["_DEBUG"] = True
if CONFIG["TARGET_CPU"] == "aarch64":
@@ -37109,11 +37121,11 @@ index 1985b87ded83..cc43c08f4956 100644
Library("rid_description_gn")
diff --git third_party/libwebrtc/media/rtc_audio_video_gn/moz.build third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
-index 90168a773453..06a37c4a10e1 100644
+index 6a4544f54efa..8d0d58c29bd7 100644
--- third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
+++ third_party/libwebrtc/media/rtc_audio_video_gn/moz.build
-@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["HAVE_WEBRTC_VIDEO"] = True
+@@ -14,11 +14,20 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -37133,7 +37145,7 @@ index 90168a773453..06a37c4a10e1 100644
FINAL_LIBRARY = "xul"
-@@ -45,129 +54,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,195 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37240,16 +37252,13 @@ index 90168a773453..06a37c4a10e1 100644
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
-+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-if CONFIG["TARGET_CPU"] == "arm":
-
- CXXFLAGS += [
- "-mfpu=neon"
-+ LOCAL_INCLUDES += [
-+ "/third_party/pipewire/"
- ]
-
+- ]
+-
- DEFINES["WEBRTC_ARCH_ARM"] = True
- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
@@ -37262,21 +37271,12 @@ index 90168a773453..06a37c4a10e1 100644
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- LOCAL_INCLUDES += [
- "/third_party/pipewire/"
-@@ -176,7 +79,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
- if CONFIG["TARGET_CPU"] == "mips64":
-
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
- DEFINES["_GNU_SOURCE"] = True
- LOCAL_INCLUDES += [
- "/third_party/pipewire/"
-@@ -184,86 +86,28 @@ if CONFIG["TARGET_CPU"] == "mips64":
-
if CONFIG["TARGET_CPU"] == "x86":
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37323,55 +37323,35 @@ index 90168a773453..06a37c4a10e1 100644
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
-- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-- LOCAL_INCLUDES += [
-- "/third_party/pipewire/"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
-
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- LOCAL_INCLUDES += [
- "/third_party/pipewire/"
- ]
-
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
+
- CXXFLAGS += [
- "-msse2"
- ]
+if CONFIG["TARGET_CPU"] == "x86_64":
-+ DEFINES["WEBRTC_ENABLE_AVX2"] = True
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- LOCAL_INCLUDES += [
- "/third_party/pipewire/"
- ]
++ DEFINES["WEBRTC_ENABLE_AVX2"] = True
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
--
-- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-- DEFINES["_GNU_SOURCE"] = True
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-- LOCAL_INCLUDES += [
-- "/third_party/pipewire/"
-- ]
+- DEFINES["_GNU_SOURCE"] = True
+ DEFINES["USE_X11"] = "1"
Library("rtc_audio_video_gn")
diff --git third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-index 1adaccb51489..2c9bb96060fb 100644
+index e80128aecdeb..77526b138660 100644
--- third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
+++ third_party/libwebrtc/media/rtc_internal_video_codecs_gn/moz.build
-@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -14,11 +14,20 @@ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
DEFINES["RTC_USE_LIBAOM_AV1_ENCODER"] = True
@@ -37392,7 +37372,7 @@ index 1adaccb51489..2c9bb96060fb 100644
FINAL_LIBRARY = "xul"
-@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37591,11 +37571,11 @@ index 1adaccb51489..2c9bb96060fb 100644
Library("rtc_internal_video_codecs_gn")
diff --git third_party/libwebrtc/media/rtc_media_base_gn/moz.build third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-index 64266d40b4d4..a857149705a7 100644
+index 58c4f572fa11..7e7ca1cbab42 100644
--- third_party/libwebrtc/media/rtc_media_base_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_base_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -37615,7 +37595,7 @@ index 64266d40b4d4..a857149705a7 100644
FINAL_LIBRARY = "xul"
-@@ -39,124 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,124 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37741,7 +37721,7 @@ index 64266d40b4d4..a857149705a7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -167,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37794,11 +37774,11 @@ index 64266d40b4d4..a857149705a7 100644
-
Library("rtc_media_base_gn")
diff --git third_party/libwebrtc/media/rtc_media_config_gn/moz.build third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-index 1b6f1e5f819e..dd752363d357 100644
+index 42d0c4a66949..c50b94a79309 100644
--- third_party/libwebrtc/media/rtc_media_config_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -37818,7 +37798,7 @@ index 1b6f1e5f819e..dd752363d357 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -37928,7 +37908,7 @@ index 1b6f1e5f819e..dd752363d357 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -37981,11 +37961,11 @@ index 1b6f1e5f819e..dd752363d357 100644
-
Library("rtc_media_config_gn")
diff --git third_party/libwebrtc/media/rtc_media_gn/moz.build third_party/libwebrtc/media/rtc_media_gn/moz.build
-index d1ab590e0b6a..2a6276fa89f1 100644
+index 090c3083a914..f84a9e395510 100644
--- third_party/libwebrtc/media/rtc_media_gn/moz.build
+++ third_party/libwebrtc/media/rtc_media_gn/moz.build
-@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["HAVE_WEBRTC_VIDEO"] = True
+@@ -14,11 +14,20 @@ DEFINES["HAVE_WEBRTC_VIDEO"] = True
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -38005,7 +37985,7 @@ index d1ab590e0b6a..2a6276fa89f1 100644
FINAL_LIBRARY = "xul"
-@@ -40,128 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -41,128 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38135,7 +38115,7 @@ index d1ab590e0b6a..2a6276fa89f1 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -171,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -172,50 +70,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38188,11 +38168,11 @@ index d1ab590e0b6a..2a6276fa89f1 100644
-
Library("rtc_media_gn")
diff --git third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
-index 1e630fef1e9c..fe3ca3871764 100644
+index 0b90567eff54..581f825bfb68 100644
--- third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
+++ third_party/libwebrtc/media/rtc_sdp_video_format_utils_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -38212,7 +38192,7 @@ index 1e630fef1e9c..fe3ca3871764 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38406,11 +38386,11 @@ index 1e630fef1e9c..fe3ca3871764 100644
Library("rtc_sdp_video_format_utils_gn")
diff --git third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-index 28bddfa3df6c..f610f31e77da 100644
+index cb9bed23cb55..fe76cd431ff6 100644
--- third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
+++ third_party/libwebrtc/media/rtc_simulcast_encoder_adapter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -38430,7 +38410,7 @@ index 28bddfa3df6c..f610f31e77da 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38629,11 +38609,11 @@ index 28bddfa3df6c..f610f31e77da 100644
Library("rtc_simulcast_encoder_adapter_gn")
diff --git third_party/libwebrtc/media/rtp_utils_gn/moz.build third_party/libwebrtc/media/rtp_utils_gn/moz.build
-index fb6bf035b541..3de425bdbccc 100644
+index 27f94a49fa4b..8d2edadb7d0e 100644
--- third_party/libwebrtc/media/rtp_utils_gn/moz.build
+++ third_party/libwebrtc/media/rtp_utils_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -38653,7 +38633,7 @@ index fb6bf035b541..3de425bdbccc 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38763,7 +38743,7 @@ index fb6bf035b541..3de425bdbccc 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -38816,11 +38796,11 @@ index fb6bf035b541..3de425bdbccc 100644
-
Library("rtp_utils_gn")
diff --git third_party/libwebrtc/media/stream_params_gn/moz.build third_party/libwebrtc/media/stream_params_gn/moz.build
-index fc9cfc7fec48..04e834b5bc39 100644
+index c65d7a53ed46..ef3886295fed 100644
--- third_party/libwebrtc/media/stream_params_gn/moz.build
+++ third_party/libwebrtc/media/stream_params_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -38840,7 +38820,7 @@ index fc9cfc7fec48..04e834b5bc39 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -38950,7 +38930,7 @@ index fc9cfc7fec48..04e834b5bc39 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -39003,11 +38983,11 @@ index fc9cfc7fec48..04e834b5bc39 100644
-
Library("stream_params_gn")
diff --git third_party/libwebrtc/media/video_adapter_gn/moz.build third_party/libwebrtc/media/video_adapter_gn/moz.build
-index 01d68b1953aa..0ed1988aa44e 100644
+index d06fd4ea8e37..4e50253cb413 100644
--- third_party/libwebrtc/media/video_adapter_gn/moz.build
+++ third_party/libwebrtc/media/video_adapter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -39027,7 +39007,7 @@ index 01d68b1953aa..0ed1988aa44e 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39221,11 +39201,11 @@ index 01d68b1953aa..0ed1988aa44e 100644
Library("video_adapter_gn")
diff --git third_party/libwebrtc/media/video_broadcaster_gn/moz.build third_party/libwebrtc/media/video_broadcaster_gn/moz.build
-index c009305537a3..f3a9666e381e 100644
+index 3d33f289d9a2..52b7067da392 100644
--- third_party/libwebrtc/media/video_broadcaster_gn/moz.build
+++ third_party/libwebrtc/media/video_broadcaster_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -39245,7 +39225,7 @@ index c009305537a3..f3a9666e381e 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39439,11 +39419,11 @@ index c009305537a3..f3a9666e381e 100644
Library("video_broadcaster_gn")
diff --git third_party/libwebrtc/media/video_common_gn/moz.build third_party/libwebrtc/media/video_common_gn/moz.build
-index 9fdf90d2eab1..157142b5b25e 100644
+index 3423c19bd60e..03bd0dd5e648 100644
--- third_party/libwebrtc/media/video_common_gn/moz.build
+++ third_party/libwebrtc/media/video_common_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -39463,7 +39443,7 @@ index 9fdf90d2eab1..157142b5b25e 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39657,11 +39637,11 @@ index 9fdf90d2eab1..157142b5b25e 100644
Library("video_common_gn")
diff --git third_party/libwebrtc/media/video_source_base_gn/moz.build third_party/libwebrtc/media/video_source_base_gn/moz.build
-index 98060ff1d3a0..81956c111ea3 100644
+index 8bfea357cdbb..2f9861d6c38a 100644
--- third_party/libwebrtc/media/video_source_base_gn/moz.build
+++ third_party/libwebrtc/media/video_source_base_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -39681,7 +39661,7 @@ index 98060ff1d3a0..81956c111ea3 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -39875,11 +39855,11 @@ index 98060ff1d3a0..81956c111ea3 100644
Library("video_source_base_gn")
diff --git third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-index fa5724cd7b6d..e5fc71a9fce0 100644
+index df4aa2f2cf44..03f4a4610a90 100644
--- third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/async_audio_processing/async_audio_processing_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -39899,7 +39879,7 @@ index fa5724cd7b6d..e5fc71a9fce0 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40093,11 +40073,11 @@ index fa5724cd7b6d..e5fc71a9fce0 100644
Library("async_audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-index 942ca391253e..56ace0cdef4a 100644
+index 7ced6b2f5e9a..0dcf2ab3da45 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -40117,7 +40097,7 @@ index 942ca391253e..56ace0cdef4a 100644
FINAL_LIBRARY = "xul"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40315,11 +40295,11 @@ index 942ca391253e..56ace0cdef4a 100644
Library("audio_coding_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-index 722f61ffeb62..07bc360e04be 100644
+index ba94b42663e7..18b923fd01d7 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_module_typedefs_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -40339,7 +40319,7 @@ index 722f61ffeb62..07bc360e04be 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40449,7 +40429,7 @@ index 722f61ffeb62..07bc360e04be 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -40502,11 +40482,11 @@ index 722f61ffeb62..07bc360e04be 100644
-
Library("audio_coding_module_typedefs_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-index 3179e363d16c..836cd7d4259d 100644
+index 30e0511c1202..60a140cf508e 100644
--- third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_coding_opus_common_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -40526,7 +40506,7 @@ index 3179e363d16c..836cd7d4259d 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40720,11 +40700,11 @@ index 3179e363d16c..836cd7d4259d 100644
Library("audio_coding_opus_common_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-index 29c2f1ad4f99..dfd43bdcc3ab 100644
+index 517f1c385402..a90873f05e5f 100644
--- third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_encoder_cng_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -40744,7 +40724,7 @@ index 29c2f1ad4f99..dfd43bdcc3ab 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -40942,11 +40922,11 @@ index 29c2f1ad4f99..dfd43bdcc3ab 100644
Library("audio_encoder_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-index 469146e9acdc..c23d12cc0979 100644
+index 0551767ad41e..d59a3765cd70 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -40966,7 +40946,7 @@ index 469146e9acdc..c23d12cc0979 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41149,11 +41129,11 @@ index 469146e9acdc..c23d12cc0979 100644
Library("audio_network_adaptor_config_gn")
diff --git third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-index 520c1d24293a..d4173377c188 100644
+index e67a684aaf53..7919faa59988 100644
--- third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/audio_network_adaptor_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -41173,7 +41153,7 @@ index 520c1d24293a..d4173377c188 100644
FINAL_LIBRARY = "xul"
-@@ -53,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -54,190 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41371,11 +41351,11 @@ index 520c1d24293a..d4173377c188 100644
Library("audio_network_adaptor_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-index 0093dc4e6a29..80b14354a709 100644
+index dedcda5d379f..7381cf2820f4 100644
--- third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_c_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -41395,7 +41375,7 @@ index 0093dc4e6a29..80b14354a709 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41578,11 +41558,11 @@ index 0093dc4e6a29..80b14354a709 100644
Library("g711_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-index 1883839bf2f6..5ea9245960d3 100644
+index 6ff2b5757c16..46fe5e5d3952 100644
--- third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g711_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -41602,7 +41582,7 @@ index 1883839bf2f6..5ea9245960d3 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -41796,11 +41776,11 @@ index 1883839bf2f6..5ea9245960d3 100644
Library("g711_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-index e529107882e3..36607b5052fe 100644
+index 7af4da2823b9..08ab446a0a88 100644
--- third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_c_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -41820,7 +41800,7 @@ index e529107882e3..36607b5052fe 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42003,11 +41983,11 @@ index e529107882e3..36607b5052fe 100644
Library("g722_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-index 1edb33c02700..7b6097e2aed1 100644
+index 5a440b4ff1c8..2fdbaa878fc1 100644
--- third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/g722_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -42027,7 +42007,7 @@ index 1edb33c02700..7b6097e2aed1 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42221,11 +42201,11 @@ index 1edb33c02700..7b6097e2aed1 100644
Library("g722_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-index 9b461b1c25af..48d6a8238c65 100644
+index 8337bf3634c6..ac6b63091c79 100644
--- third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_bwinfo_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -42245,7 +42225,7 @@ index 9b461b1c25af..48d6a8238c65 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42355,7 +42335,7 @@ index 9b461b1c25af..48d6a8238c65 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -42408,11 +42388,11 @@ index 9b461b1c25af..48d6a8238c65 100644
-
Library("isac_bwinfo_gn")
diff --git third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-index 4aa8ad903cb2..74726ce2c3fa 100644
+index ea88c1d8f583..57e8546bdbf4 100644
--- third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/isac_vad_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -42432,7 +42412,7 @@ index 4aa8ad903cb2..74726ce2c3fa 100644
FINAL_LIBRARY = "xul"
-@@ -46,175 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,175 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42615,11 +42595,11 @@ index 4aa8ad903cb2..74726ce2c3fa 100644
Library("isac_vad_gn")
diff --git third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-index 1dfa3e67f353..059cbe1c221b 100644
+index ca334dc3fe78..747b4ac34f8c 100644
--- third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/legacy_encoded_audio_frame_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -42639,7 +42619,7 @@ index 1dfa3e67f353..059cbe1c221b 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -42833,11 +42813,11 @@ index 1dfa3e67f353..059cbe1c221b 100644
Library("legacy_encoded_audio_frame_gn")
diff --git third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-index 08f8439eb07b..38c391c65bcd 100644
+index 2551d1916e01..87a4113e6abf 100644
--- third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/neteq_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -42857,7 +42837,7 @@ index 08f8439eb07b..38c391c65bcd 100644
FINAL_LIBRARY = "xul"
-@@ -78,190 +87,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -79,190 +88,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43055,11 +43035,11 @@ index 08f8439eb07b..38c391c65bcd 100644
Library("neteq_gn")
diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-index 1f357c4fb65d..0e172820621f 100644
+index d9334cabeb19..030e4a70ff28 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_c_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -43079,7 +43059,7 @@ index 1f357c4fb65d..0e172820621f 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43262,11 +43242,11 @@ index 1f357c4fb65d..0e172820621f 100644
Library("pcm16b_c_gn")
diff --git third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-index 3ea40d6df74d..437ca5438b62 100644
+index 0b30779563f7..c552b27c5ff3 100644
--- third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/pcm16b_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -43286,7 +43266,7 @@ index 3ea40d6df74d..437ca5438b62 100644
FINAL_LIBRARY = "xul"
-@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,186 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43480,11 +43460,11 @@ index 3ea40d6df74d..437ca5438b62 100644
Library("pcm16b_gn")
diff --git third_party/libwebrtc/modules/audio_coding/red_gn/moz.build third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-index 90cfee8f5214..8d208793ff79 100644
+index 58e8afef9a00..965e9dd8ba94 100644
--- third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/red_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -43504,7 +43484,7 @@ index 90cfee8f5214..8d208793ff79 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43702,11 +43682,11 @@ index 90cfee8f5214..8d208793ff79 100644
Library("red_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-index 9a4452803747..1feff6421a4c 100644
+index 291bd3be385d..1deff194ac14 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_cng_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -43726,7 +43706,7 @@ index 9a4452803747..1feff6421a4c 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -43924,11 +43904,11 @@ index 9a4452803747..1feff6421a4c 100644
Library("webrtc_cng_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-index 62e6d99b0499..bb4eca518817 100644
+index 6dfe8fd91f4f..104ad0dd9d28 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_multiopus_gn/moz.build
-@@ -12,13 +12,22 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -43950,7 +43930,7 @@ index 62e6d99b0499..bb4eca518817 100644
FINAL_LIBRARY = "xul"
-@@ -47,186 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,186 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44144,11 +44124,11 @@ index 62e6d99b0499..bb4eca518817 100644
Library("webrtc_multiopus_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-index a540a00469f3..90011b5c16e2 100644
+index 867fbd623276..2094705f8b93 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_gn/moz.build
-@@ -12,13 +12,22 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -44170,7 +44150,7 @@ index a540a00469f3..90011b5c16e2 100644
FINAL_LIBRARY = "xul"
-@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44368,11 +44348,11 @@ index a540a00469f3..90011b5c16e2 100644
Library("webrtc_opus_gn")
diff --git third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-index 8970c596ba17..64721c4655fb 100644
+index 5ec9b465ea77..162b9091b2d2 100644
--- third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_coding/webrtc_opus_wrapper_gn/moz.build
-@@ -12,13 +12,22 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,13 +13,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -44394,7 +44374,7 @@ index 8970c596ba17..64721c4655fb 100644
FINAL_LIBRARY = "xul"
-@@ -46,179 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,179 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44581,11 +44561,11 @@ index 8970c596ba17..64721c4655fb 100644
Library("webrtc_opus_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-index 0bd773f44928..956114463750 100644
+index 4ca6aa495569..3885140cb11b 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -44605,7 +44585,7 @@ index 0bd773f44928..956114463750 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44715,7 +44695,7 @@ index 0bd773f44928..956114463750 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -44768,11 +44748,11 @@ index 0bd773f44928..956114463750 100644
-
Library("audio_device_gn")
diff --git third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
-index ec77b35b94a4..b7a55333da6b 100644
+index 65a33184e738..4a54e312b60b 100644
--- third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_device/audio_device_impl_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -44792,7 +44772,7 @@ index ec77b35b94a4..b7a55333da6b 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -44902,7 +44882,7 @@ index ec77b35b94a4..b7a55333da6b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -44955,11 +44935,11 @@ index ec77b35b94a4..b7a55333da6b 100644
-
Library("audio_device_impl_gn")
diff --git third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-index 1a1300027eb4..c7a666de4c41 100644
+index a14b9eb8fe9a..8fd614a1e9e9 100644
--- third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_mixer/audio_frame_manipulator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -44979,7 +44959,7 @@ index 1a1300027eb4..c7a666de4c41 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45177,11 +45157,11 @@ index 1a1300027eb4..c7a666de4c41 100644
Library("audio_frame_manipulator_gn")
diff --git third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-index 1f38d95be5ec..77161a5e662b 100644
+index 079f132d8ed0..9e2e510689f2 100644
--- third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_mixer/audio_mixer_impl_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -45202,7 +45182,7 @@ index 1f38d95be5ec..77161a5e662b 100644
FINAL_LIBRARY = "xul"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45400,11 +45380,11 @@ index 1f38d95be5ec..77161a5e662b 100644
Library("audio_mixer_impl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-index 5cf655eb9246..8b643a359c70 100644
+index 7ad364fc287b..6392e9de1af6 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_erl_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -45424,7 +45404,7 @@ index 5cf655eb9246..8b643a359c70 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45538,7 +45518,7 @@ index 5cf655eb9246..8b643a359c70 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45591,11 +45571,11 @@ index 5cf655eb9246..8b643a359c70 100644
-
Library("adaptive_fir_filter_erl_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-index 497676ffe622..fe1e34fdfc49 100644
+index c3c6602eeabe..668753ceeacd 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/adaptive_fir_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -45615,7 +45595,7 @@ index 497676ffe622..fe1e34fdfc49 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45740,7 +45720,7 @@ index 497676ffe622..fe1e34fdfc49 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -45793,11 +45773,11 @@ index 497676ffe622..fe1e34fdfc49 100644
-
Library("adaptive_fir_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-index ed02ca92381c..46c86f3568d0 100644
+index 2a389ece3b18..50070028546d 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn/moz.build
-@@ -17,13 +17,22 @@ CXXFLAGS += [
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,13 +18,22 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -45819,7 +45799,7 @@ index ed02ca92381c..46c86f3568d0 100644
FINAL_LIBRARY = "xul"
-@@ -54,134 +63,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,134 +64,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -45958,11 +45938,11 @@ index ed02ca92381c..46c86f3568d0 100644
Library("aec3_avx2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-index 3fb0ea8a2c6a..281b817e914c 100644
+index 03c744941770..e5ed79803265 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_common_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -45982,7 +45962,7 @@ index 3fb0ea8a2c6a..281b817e914c 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46092,7 +46072,7 @@ index 3fb0ea8a2c6a..281b817e914c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46145,11 +46125,11 @@ index 3fb0ea8a2c6a..281b817e914c 100644
-
Library("aec3_common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-index 4900eca9532f..b7ed821a08d2 100644
+index b840e8d28285..dabb2ba6b331 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_fft_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -46169,7 +46149,7 @@ index 4900eca9532f..b7ed821a08d2 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46294,7 +46274,7 @@ index 4900eca9532f..b7ed821a08d2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46347,11 +46327,11 @@ index 4900eca9532f..b7ed821a08d2 100644
-
Library("aec3_fft_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-index 53b983a22fa7..45252f2e5ce8 100644
+index bb4aa00b9fa6..3b77e799840a 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/aec3_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -46372,7 +46352,7 @@ index 53b983a22fa7..45252f2e5ce8 100644
FINAL_LIBRARY = "xul"
-@@ -100,190 +109,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -101,190 +110,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46570,11 +46550,11 @@ index 53b983a22fa7..45252f2e5ce8 100644
Library("aec3_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-index 5310e43a1d89..0c9cc569430d 100644
+index d91b97726db0..af84b43ca439 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/fft_data_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -46594,7 +46574,7 @@ index 5310e43a1d89..0c9cc569430d 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46708,7 +46688,7 @@ index 5310e43a1d89..0c9cc569430d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46761,11 +46741,11 @@ index 5310e43a1d89..0c9cc569430d 100644
-
Library("fft_data_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-index 16305e915fb6..433d161cb781 100644
+index f423946bc227..c3324812d865 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/matched_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -46785,7 +46765,7 @@ index 16305e915fb6..433d161cb781 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -46899,7 +46879,7 @@ index 16305e915fb6..433d161cb781 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -46952,11 +46932,11 @@ index 16305e915fb6..433d161cb781 100644
-
Library("matched_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-index 107439b1d3d8..ee2869af9930 100644
+index 45a89ccbfbfa..fe641efc8111 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/render_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -46976,7 +46956,7 @@ index 107439b1d3d8..ee2869af9930 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47090,7 +47070,7 @@ index 107439b1d3d8..ee2869af9930 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47143,11 +47123,11 @@ index 107439b1d3d8..ee2869af9930 100644
-
Library("render_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-index 727984504717..8420c2a67ee0 100644
+index 2c6400d8b230..f9c9407c1a18 100644
--- third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec3/vector_math_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -47167,7 +47147,7 @@ index 727984504717..8420c2a67ee0 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47281,7 +47261,7 @@ index 727984504717..8420c2a67ee0 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47334,11 +47314,11 @@ index 727984504717..8420c2a67ee0 100644
-
Library("vector_math_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-index 2fa8e61caaf6..2426c14c0008 100644
+index 644c5fb92216..892353d5a5a9 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump/aec_dump_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -47358,7 +47338,7 @@ index 2fa8e61caaf6..2426c14c0008 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47479,7 +47459,7 @@ index 2fa8e61caaf6..2426c14c0008 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -47532,11 +47512,11 @@ index 2fa8e61caaf6..2426c14c0008 100644
-
Library("aec_dump_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-index f4a57f1fbac8..b3959e4726fd 100644
+index e3ddd42e6d91..22365c268eb4 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump/null_aec_dump_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -47556,7 +47536,7 @@ index f4a57f1fbac8..b3959e4726fd 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47750,11 +47730,11 @@ index f4a57f1fbac8..b3959e4726fd 100644
Library("null_aec_dump_factory_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-index 6196d6ff4ff0..91b70f2ef1b6 100644
+index 55fe444f90d4..b518e0fe73db 100644
--- third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aec_dump_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -47774,7 +47754,7 @@ index 6196d6ff4ff0..91b70f2ef1b6 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -47968,11 +47948,11 @@ index 6196d6ff4ff0..91b70f2ef1b6 100644
Library("aec_dump_interface_gn")
diff --git third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-index a884cffa8f5f..2d6f110d04dc 100644
+index fc9828874560..d280cf9642f4 100644
--- third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -47992,7 +47972,7 @@ index a884cffa8f5f..2d6f110d04dc 100644
FINAL_LIBRARY = "xul"
-@@ -44,114 +53,7 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,114 +54,7 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48108,7 +48088,7 @@ index a884cffa8f5f..2d6f110d04dc 100644
if CONFIG["TARGET_CPU"] == "aarch64":
-@@ -159,27 +61,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -160,27 +62,12 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_HAS_NEON"] = True
SOURCES += [
@@ -48137,7 +48117,7 @@ index a884cffa8f5f..2d6f110d04dc 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
-@@ -188,7 +75,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -189,7 +76,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
@@ -48145,7 +48125,7 @@ index a884cffa8f5f..2d6f110d04dc 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_mips.cc"
-@@ -196,8 +82,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -197,8 +83,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
if CONFIG["TARGET_CPU"] == "mips64":
@@ -48154,7 +48134,7 @@ index a884cffa8f5f..2d6f110d04dc 100644
SOURCES += [
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
-@@ -208,90 +92,34 @@ if CONFIG["TARGET_CPU"] == "ppc64":
+@@ -209,90 +93,34 @@ if CONFIG["TARGET_CPU"] == "ppc64":
"/third_party/libwebrtc/modules/audio_processing/aecm/aecm_core_c.cc"
]
@@ -48255,11 +48235,11 @@ index a884cffa8f5f..2d6f110d04dc 100644
+
Library("aecm_core_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-index c456275f855a..ac4803f3488f 100644
+index c4325ac824cb..47f526008661 100644
--- third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/agc_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -48280,7 +48260,7 @@ index c456275f855a..ac4803f3488f 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48478,11 +48458,11 @@ index c456275f855a..ac4803f3488f 100644
Library("agc_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-index 456421e167ea..e18a5ed5f14e 100644
+index 5983e4f77576..127f60740aed 100644
--- third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/gain_control_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -48502,7 +48482,7 @@ index 456421e167ea..e18a5ed5f14e 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48612,7 +48592,7 @@ index 456421e167ea..e18a5ed5f14e 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -48665,11 +48645,11 @@ index 456421e167ea..e18a5ed5f14e 100644
-
Library("gain_control_interface_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-index ab1285e34d37..38bee0b95eaa 100644
+index fc5a6d3a17ac..13a466730810 100644
--- third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/legacy_agc_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -48689,7 +48669,7 @@ index ab1285e34d37..38bee0b95eaa 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -48887,11 +48867,11 @@ index ab1285e34d37..38bee0b95eaa 100644
Library("legacy_agc_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-index 14e35c2e0246..bacac4da045d 100644
+index 35537a26bfaa..9f58d8bde235 100644
--- third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc/level_estimation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -48911,7 +48891,7 @@ index 14e35c2e0246..bacac4da045d 100644
FINAL_LIBRARY = "xul"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49109,11 +49089,11 @@ index 14e35c2e0246..bacac4da045d 100644
Library("level_estimation_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-index a926bba44729..ec062dd8dcca 100644
+index e225f10fa3cd..d7a4d53ab75c 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/adaptive_digital_gain_controller_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -49134,7 +49114,7 @@ index a926bba44729..ec062dd8dcca 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49332,11 +49312,11 @@ index a926bba44729..ec062dd8dcca 100644
Library("adaptive_digital_gain_controller_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-index 2ccf23b32856..4c4aea313a76 100644
+index 6622d617c907..8dfe3f760d23 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/biquad_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -49356,7 +49336,7 @@ index 2ccf23b32856..4c4aea313a76 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49543,11 +49523,11 @@ index 2ccf23b32856..4c4aea313a76 100644
Library("biquad_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-index b7bfe444b7fb..978fca187767 100644
+index beda030559b6..bb6b4b02c9bb 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/clipping_predictor_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -49567,7 +49547,7 @@ index b7bfe444b7fb..978fca187767 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49765,11 +49745,11 @@ index b7bfe444b7fb..978fca187767 100644
Library("clipping_predictor_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-index 138354dbc46a..1d1718c4a270 100644
+index cf2c69fcdfaa..a3693736aedb 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/common_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -49789,7 +49769,7 @@ index 138354dbc46a..1d1718c4a270 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -49899,7 +49879,7 @@ index 138354dbc46a..1d1718c4a270 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -49952,11 +49932,11 @@ index 138354dbc46a..1d1718c4a270 100644
-
Library("common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-index 2f40304afaee..50c4819481af 100644
+index 0de2dc9384e3..de0334f13255 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/cpu_features_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -49976,7 +49956,7 @@ index 2f40304afaee..50c4819481af 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50174,11 +50154,11 @@ index 2f40304afaee..50c4819481af 100644
Library("cpu_features_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-index f5c615e7c144..edbdcc79c315 100644
+index 42be77d0926e..5cc90ad1f104 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/fixed_digital_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -50199,7 +50179,7 @@ index f5c615e7c144..edbdcc79c315 100644
FINAL_LIBRARY = "xul"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50397,11 +50377,11 @@ index f5c615e7c144..edbdcc79c315 100644
Library("fixed_digital_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-index 336fbad968e3..16bd1dcb8f4d 100644
+index 74f97ce3d86b..e5ccbba3faa4 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/gain_applier_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -50421,7 +50401,7 @@ index 336fbad968e3..16bd1dcb8f4d 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50615,11 +50595,11 @@ index 336fbad968e3..16bd1dcb8f4d 100644
Library("gain_applier_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
-index a542386830ea..205ef2fa8610 100644
+index f737fa6929fb..27094cde280b 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/gain_map_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -50639,7 +50619,7 @@ index a542386830ea..205ef2fa8610 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -50749,7 +50729,7 @@ index a542386830ea..205ef2fa8610 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -50802,11 +50782,11 @@ index a542386830ea..205ef2fa8610 100644
-
Library("gain_map_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-index f5be716a8bc5..a953fa94c99a 100644
+index e9a5eecf6501..f974969cef4f 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_controller_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -50827,7 +50807,7 @@ index f5be716a8bc5..a953fa94c99a 100644
FINAL_LIBRARY = "xul"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51025,11 +51005,11 @@ index f5be716a8bc5..a953fa94c99a 100644
Library("input_volume_controller_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-index feb82f3997c9..d06082663d6a 100644
+index 16dc6a71efd0..e9e41bc13fdb 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/input_volume_stats_reporter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -51049,7 +51029,7 @@ index feb82f3997c9..d06082663d6a 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51243,11 +51223,11 @@ index feb82f3997c9..d06082663d6a 100644
Library("input_volume_stats_reporter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-index e90d9910bf62..82e5e8f4333b 100644
+index 9c436a5d0f3a..7af9460687a6 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/noise_level_estimator_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -51268,7 +51248,7 @@ index e90d9910bf62..82e5e8f4333b 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51466,11 +51446,11 @@ index e90d9910bf62..82e5e8f4333b 100644
Library("noise_level_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-index 24079e9ae6d1..171732e1f557 100644
+index 59564cc1e285..954c989398f4 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_auto_correlation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -51490,7 +51470,7 @@ index 24079e9ae6d1..171732e1f557 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51688,11 +51668,11 @@ index 24079e9ae6d1..171732e1f557 100644
Library("rnn_vad_auto_correlation_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-index 49c7c7762c63..32c5af366c7d 100644
+index bf0b365e6eee..52089937e2a4 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_common_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -51712,7 +51692,7 @@ index 49c7c7762c63..32c5af366c7d 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -51837,7 +51817,7 @@ index 49c7c7762c63..32c5af366c7d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -51890,11 +51870,11 @@ index 49c7c7762c63..32c5af366c7d 100644
-
Library("rnn_vad_common_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-index 26a7d3b891a7..696f0ee96b59 100644
+index 138685a386db..575ac8951bd6 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -51914,7 +51894,7 @@ index 26a7d3b891a7..696f0ee96b59 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52112,11 +52092,11 @@ index 26a7d3b891a7..696f0ee96b59 100644
Library("rnn_vad_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-index 04a1e7cc555a..413755876901 100644
+index 699bc21ae364..577a86ada3c3 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_layers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -52136,7 +52116,7 @@ index 04a1e7cc555a..413755876901 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52334,11 +52314,11 @@ index 04a1e7cc555a..413755876901 100644
Library("rnn_vad_layers_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-index 98019531c7f9..58978d7f3e35 100644
+index b25ad71cb8d9..0e7ee8647c24 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_lp_residual_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -52358,7 +52338,7 @@ index 98019531c7f9..58978d7f3e35 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52545,11 +52525,11 @@ index 98019531c7f9..58978d7f3e35 100644
Library("rnn_vad_lp_residual_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-index 7d650f259e13..56c167cc8561 100644
+index 236281787c93..537751526475 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_pitch_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -52569,7 +52549,7 @@ index 7d650f259e13..56c167cc8561 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52767,11 +52747,11 @@ index 7d650f259e13..56c167cc8561 100644
Library("rnn_vad_pitch_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-index 0eb74a400fb0..4591b6d57ed8 100644
+index 49e0ac0e1752..af5b80e27004 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_ring_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -52791,7 +52771,7 @@ index 0eb74a400fb0..4591b6d57ed8 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -52905,7 +52885,7 @@ index 0eb74a400fb0..4591b6d57ed8 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -52958,11 +52938,11 @@ index 0eb74a400fb0..4591b6d57ed8 100644
-
Library("rnn_vad_ring_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-index 2df8bb1943ed..0fa750093bb2 100644
+index 25ebe1ded808..5aeecbb95fb0 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_sequence_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -52982,7 +52962,7 @@ index 2df8bb1943ed..0fa750093bb2 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53096,7 +53076,7 @@ index 2df8bb1943ed..0fa750093bb2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -53149,11 +53129,11 @@ index 2df8bb1943ed..0fa750093bb2 100644
-
Library("rnn_vad_sequence_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-index be92010f91fa..4936229921d9 100644
+index 3fd01cae8e39..6029a14a410a 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_spectral_features_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -53173,7 +53153,7 @@ index be92010f91fa..4936229921d9 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53371,11 +53351,11 @@ index be92010f91fa..4936229921d9 100644
Library("rnn_vad_spectral_features_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-index 709fac2fabc4..0976324eb70d 100644
+index 81600c1ed958..654468ece4cd 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/rnn_vad_symmetric_matrix_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -53395,7 +53375,7 @@ index 709fac2fabc4..0976324eb70d 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53509,7 +53489,7 @@ index 709fac2fabc4..0976324eb70d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -53562,11 +53542,11 @@ index 709fac2fabc4..0976324eb70d 100644
-
Library("rnn_vad_symmetric_matrix_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-index b24d7b4742f2..c956363856eb 100644
+index c27d2ed5f439..286a59787858 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn/moz.build
-@@ -17,12 +17,21 @@ CXXFLAGS += [
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,12 +18,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -53587,7 +53567,7 @@ index b24d7b4742f2..c956363856eb 100644
FINAL_LIBRARY = "xul"
-@@ -49,134 +58,16 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,134 +59,16 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53726,11 +53706,11 @@ index b24d7b4742f2..c956363856eb 100644
Library("vector_math_avx2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-index edc37cfec66d..8420c2a67ee0 100644
+index 9b4370335783..f9c9407c1a18 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -53750,7 +53730,7 @@ index edc37cfec66d..8420c2a67ee0 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -53875,7 +53855,7 @@ index edc37cfec66d..8420c2a67ee0 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -53928,11 +53908,11 @@ index edc37cfec66d..8420c2a67ee0 100644
-
Library("vector_math_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-index d71b31c270e2..795d8ebb9737 100644
+index c312fba12052..d996b4cc9d90 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/saturation_protector_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -53953,7 +53933,7 @@ index d71b31c270e2..795d8ebb9737 100644
FINAL_LIBRARY = "xul"
-@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54151,11 +54131,11 @@ index d71b31c270e2..795d8ebb9737 100644
Library("saturation_protector_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-index 1e8ce8cdd78c..c87eec7a75bd 100644
+index 343cfc723b09..8c6eb49b4512 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/speech_level_estimator_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -54176,7 +54156,7 @@ index 1e8ce8cdd78c..c87eec7a75bd 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54374,11 +54354,11 @@ index 1e8ce8cdd78c..c87eec7a75bd 100644
Library("speech_level_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-index ef605c387ad5..5c95e03997df 100644
+index a82ded938c6b..93c53adca4bb 100644
--- third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/agc2/vad_wrapper_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -54398,7 +54378,7 @@ index ef605c387ad5..5c95e03997df 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54596,11 +54576,11 @@ index ef605c387ad5..5c95e03997df 100644
Library("vad_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-index f74ce8a70dc4..5be7419cee20 100644
+index a09b4c70b19d..23f44e13d5bb 100644
--- third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/apm_logging_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -54621,7 +54601,7 @@ index f74ce8a70dc4..5be7419cee20 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -54819,11 +54799,11 @@ index f74ce8a70dc4..5be7419cee20 100644
Library("apm_logging_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-index 17db8ead56a7..bd926084a6ce 100644
+index 2b2e58b89940..b833396bba9b 100644
--- third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_buffer_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -54844,7 +54824,7 @@ index 17db8ead56a7..bd926084a6ce 100644
FINAL_LIBRARY = "xul"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55042,11 +55022,11 @@ index 17db8ead56a7..bd926084a6ce 100644
Library("audio_buffer_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-index 8c5816304747..a21ed67082b0 100644
+index 062f65365d8d..c6e89fcf1c87 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_proxies_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -55066,7 +55046,7 @@ index 8c5816304747..a21ed67082b0 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55260,11 +55240,11 @@ index 8c5816304747..a21ed67082b0 100644
Library("audio_frame_proxies_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-index f011e41ad837..cd71f405e9a4 100644
+index 66e92461dade..cca630b76705 100644
--- third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_frame_view_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -55284,7 +55264,7 @@ index f011e41ad837..cd71f405e9a4 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55405,7 +55385,7 @@ index f011e41ad837..cd71f405e9a4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -55458,11 +55438,11 @@ index f011e41ad837..cd71f405e9a4 100644
-
Library("audio_frame_view_gn")
diff --git third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-index 95c38f0a6293..bf2444058ce4 100644
+index 10be557444b1..786ef149fe84 100644
--- third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/audio_processing_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -55483,7 +55463,7 @@ index 95c38f0a6293..bf2444058ce4 100644
FINAL_LIBRARY = "xul"
-@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55681,11 +55661,11 @@ index 95c38f0a6293..bf2444058ce4 100644
Library("audio_processing_gn")
diff --git third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-index bfb581bfc19a..057ed5008fe2 100644
+index 7eabe2166f96..bc2da883b302 100644
--- third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/capture_levels_adjuster/capture_levels_adjuster_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -55705,7 +55685,7 @@ index bfb581bfc19a..057ed5008fe2 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -55903,11 +55883,11 @@ index bfb581bfc19a..057ed5008fe2 100644
Library("capture_levels_adjuster_gn")
diff --git third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-index 04d5bf230b3e..4190f76f185c 100644
+index 7c590c1c04e4..10ca80187523 100644
--- third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/gain_controller2_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -55928,7 +55908,7 @@ index 04d5bf230b3e..4190f76f185c 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56126,11 +56106,11 @@ index 04d5bf230b3e..4190f76f185c 100644
Library("gain_controller2_gn")
diff --git third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-index d8f32b688d0b..44c2749058fa 100644
+index 2a5c6b124653..088eaeabf901 100644
--- third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/high_pass_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -56150,7 +56130,7 @@ index d8f32b688d0b..44c2749058fa 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56348,11 +56328,11 @@ index d8f32b688d0b..44c2749058fa 100644
Library("high_pass_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-index cdb283be4f2b..4d8edc876b34 100644
+index cea8ba8d8132..b7191f1399a0 100644
--- third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/ns/ns_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -56373,7 +56353,7 @@ index cdb283be4f2b..4d8edc876b34 100644
FINAL_LIBRARY = "xul"
-@@ -56,190 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,190 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56571,11 +56551,11 @@ index cdb283be4f2b..4d8edc876b34 100644
Library("ns_gn")
diff --git third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-index 35578fe55223..5cec24215df9 100644
+index c6d670a9716f..0b6a724bea6a 100644
--- third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/rms_level_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -56595,7 +56575,7 @@ index 35578fe55223..5cec24215df9 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56782,11 +56762,11 @@ index 35578fe55223..5cec24215df9 100644
Library("rms_level_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-index 21cda458a6ce..cc9aa8a23789 100644
+index 9b82be1adb86..e85813c9141a 100644
--- third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/cascaded_biquad_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -56806,7 +56786,7 @@ index 21cda458a6ce..cc9aa8a23789 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -56993,11 +56973,11 @@ index 21cda458a6ce..cc9aa8a23789 100644
Library("cascaded_biquad_filter_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-index f3d2ab4734e6..334ae5fcb19e 100644
+index 4692680bae55..dc7c1b23536a 100644
--- third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/legacy_delay_estimator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -57017,7 +56997,7 @@ index f3d2ab4734e6..334ae5fcb19e 100644
FINAL_LIBRARY = "xul"
-@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57204,11 +57184,11 @@ index f3d2ab4734e6..334ae5fcb19e 100644
Library("legacy_delay_estimator_gn")
diff --git third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-index f56c3da34118..614e69397e87 100644
+index 609567fd1543..7a6396d4b7a7 100644
--- third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/utility/pffft_wrapper_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -57228,7 +57208,7 @@ index f56c3da34118..614e69397e87 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57415,11 +57395,11 @@ index f56c3da34118..614e69397e87 100644
Library("pffft_wrapper_gn")
diff --git third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-index bbef9ef6246b..970ceced4e0c 100644
+index e18fa6a13dc5..651adb31c8f8 100644
--- third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
+++ third_party/libwebrtc/modules/audio_processing/vad/vad_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -57439,7 +57419,7 @@ index bbef9ef6246b..970ceced4e0c 100644
FINAL_LIBRARY = "xul"
-@@ -50,190 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,190 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57637,11 +57617,11 @@ index bbef9ef6246b..970ceced4e0c 100644
Library("vad_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-index 4389423238bc..539536626c14 100644
+index d445a31d3fc0..6003c6b22afb 100644
--- third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/congestion_controller_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -57661,7 +57641,7 @@ index 4389423238bc..539536626c14 100644
FINAL_LIBRARY = "xul"
-@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -57860,11 +57840,11 @@ index 4389423238bc..539536626c14 100644
Library("congestion_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-index c4ea2411dd35..00d812745382 100644
+index 15b360f97098..7565e2a3de43 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/alr_detector_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -57884,7 +57864,7 @@ index c4ea2411dd35..00d812745382 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58078,11 +58058,11 @@ index c4ea2411dd35..00d812745382 100644
Library("alr_detector_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-index b6288b8b9dba..b299425379f1 100644
+index dcc10a6e047f..3ee2ade0e6e2 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/delay_based_bwe_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -58102,7 +58082,7 @@ index b6288b8b9dba..b299425379f1 100644
FINAL_LIBRARY = "xul"
-@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58301,11 +58281,11 @@ index b6288b8b9dba..b299425379f1 100644
Library("delay_based_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-index 7b91bffbc132..c7ad21c9a567 100644
+index cba0035df095..b05566a84bd9 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/estimators_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -58325,7 +58305,7 @@ index 7b91bffbc132..c7ad21c9a567 100644
FINAL_LIBRARY = "xul"
-@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,190 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58523,11 +58503,11 @@ index 7b91bffbc132..c7ad21c9a567 100644
Library("estimators_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-index 31f5270f937c..252a984262aa 100644
+index 52ac4f397915..9c83648d1d91 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -58547,7 +58527,7 @@ index 31f5270f937c..252a984262aa 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58746,11 +58726,11 @@ index 31f5270f937c..252a984262aa 100644
Library("goog_cc_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-index d34cc09be9ab..809519d72971 100644
+index 116a29107a5f..210869b7d740 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/link_capacity_estimator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -58770,7 +58750,7 @@ index d34cc09be9ab..809519d72971 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -58957,11 +58937,11 @@ index d34cc09be9ab..809519d72971 100644
Library("link_capacity_estimator_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
-index 6be492d21600..50730ce0d2ae 100644
+index 35f9c99e87f4..4886c9836d50 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v1_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -58981,7 +58961,7 @@ index 6be492d21600..50730ce0d2ae 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59175,11 +59155,11 @@ index 6be492d21600..50730ce0d2ae 100644
Library("loss_based_bwe_v1_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-index cc47dffd8409..faba241a563f 100644
+index 6ce1de1fa51c..0bc507c37d93 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/loss_based_bwe_v2_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -59199,7 +59179,7 @@ index cc47dffd8409..faba241a563f 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59397,11 +59377,11 @@ index cc47dffd8409..faba241a563f 100644
Library("loss_based_bwe_v2_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-index 342ac79b6a57..f22d4ec35dad 100644
+index 28aacf038f32..d8bd001c8e6d 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/probe_controller_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -59421,7 +59401,7 @@ index 342ac79b6a57..f22d4ec35dad 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59615,11 +59595,11 @@ index 342ac79b6a57..f22d4ec35dad 100644
Library("probe_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-index b04648d2b179..011e410cf1ee 100644
+index ac8867e70538..529154c4b5e7 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/pushback_controller_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -59639,7 +59619,7 @@ index b04648d2b179..011e410cf1ee 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -59833,11 +59813,11 @@ index b04648d2b179..011e410cf1ee 100644
Library("pushback_controller_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-index fd539cda7a7c..c8199d07d582 100644
+index 7d00add70158..383d7aa7785b 100644
--- third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/goog_cc/send_side_bwe_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -59857,7 +59837,7 @@ index fd539cda7a7c..c8199d07d582 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60055,11 +60035,11 @@ index fd539cda7a7c..c8199d07d582 100644
Library("send_side_bwe_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-index d749ed805f5f..66924e80dc84 100644
+index e851772ea7b7..97574a0d1d13 100644
--- third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/rtp/control_handler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -60079,7 +60059,7 @@ index d749ed805f5f..66924e80dc84 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60278,11 +60258,11 @@ index d749ed805f5f..66924e80dc84 100644
Library("control_handler_gn")
diff --git third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-index 28fb2063158d..b1b80eca85cc 100644
+index d86d84b32b52..5a4efa68c0c2 100644
--- third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
+++ third_party/libwebrtc/modules/congestion_controller/rtp/transport_feedback_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -60302,7 +60282,7 @@ index 28fb2063158d..b1b80eca85cc 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60500,11 +60480,11 @@ index 28fb2063158d..b1b80eca85cc 100644
Library("transport_feedback_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-index 9cbeb68d6f40..0feadf987590 100644
+index a467463de4d3..3c0d102a3516 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -60525,7 +60505,7 @@ index 9cbeb68d6f40..0feadf987590 100644
FINAL_LIBRARY = "xul"
-@@ -44,111 +53,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,111 +54,23 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60643,11 +60623,11 @@ index 9cbeb68d6f40..0feadf987590 100644
-
Library("desktop_capture_differ_sse2_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-index 60ff9cd6526d..c14bbe8d54c3 100644
+index d297254b8692..6ac10d4662d8 100644
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn/moz.build
-@@ -14,11 +14,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -25,11 +25,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -60667,7 +60647,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
FINAL_LIBRARY = "xul"
-@@ -70,186 +79,13 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -81,186 +90,13 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -60855,7 +60835,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -262,7 +98,8 @@ if CONFIG["TARGET_CPU"] == "arm":
+@@ -268,7 +104,8 @@ if CONFIG["TARGET_CPU"] == "arm":
]
SOURCES += [
@@ -60865,7 +60845,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
]
UNIFIED_SOURCES += [
-@@ -272,36 +109,9 @@ if CONFIG["TARGET_CPU"] == "arm":
+@@ -278,36 +115,9 @@ if CONFIG["TARGET_CPU"] == "arm":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -60905,7 +60885,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
]
if CONFIG["TARGET_CPU"] == "mips32":
-@@ -309,7 +119,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -315,7 +125,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
DEFINES["WEBRTC_USE_PIPEWIRE"] = True
@@ -60913,7 +60893,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -322,7 +131,8 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -323,7 +132,8 @@ if CONFIG["TARGET_CPU"] == "mips32":
]
SOURCES += [
@@ -60923,7 +60903,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
]
UNIFIED_SOURCES += [
-@@ -332,13 +142,14 @@ if CONFIG["TARGET_CPU"] == "mips32":
+@@ -333,13 +143,14 @@ if CONFIG["TARGET_CPU"] == "mips32":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -60940,7 +60920,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -351,7 +162,8 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -347,7 +158,8 @@ if CONFIG["TARGET_CPU"] == "mips64":
]
SOURCES += [
@@ -60950,7 +60930,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
]
UNIFIED_SOURCES += [
-@@ -361,126 +173,19 @@ if CONFIG["TARGET_CPU"] == "mips64":
+@@ -357,121 +169,19 @@ if CONFIG["TARGET_CPU"] == "mips64":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -61019,12 +60999,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
-
- LOCAL_INCLUDES += [
- "/gfx/angle/checkout/include/",
-- "/third_party/drm/drm/",
-- "/third_party/drm/drm/include/",
-- "/third_party/drm/drm/include/libdrm/",
-- "/third_party/gbm/gbm/",
-- "/third_party/libepoxy/libepoxy/include/",
-- "/third_party/pipewire/"
+- "/third_party/libepoxy/libepoxy/include/"
- ]
-
- SOURCES += [
@@ -61081,7 +61056,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -493,7 +198,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -479,7 +189,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
]
SOURCES += [
@@ -61091,7 +61066,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
]
UNIFIED_SOURCES += [
-@@ -503,13 +209,15 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -489,13 +200,15 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -61110,7 +61085,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -522,7 +230,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -503,7 +216,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
]
SOURCES += [
@@ -61120,7 +61095,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
]
UNIFIED_SOURCES += [
-@@ -532,10 +241,12 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -513,10 +227,12 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screen_capture_portal_interface.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_portal.cc",
"/third_party/libwebrtc/modules/desktop_capture/linux/wayland/screencast_stream_utils.cc",
@@ -61135,7 +61110,7 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
DEFINES["USE_X11"] = "1"
DEFINES["WEBRTC_USE_X11"] = True
-@@ -563,144 +274,61 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGE
+@@ -544,144 +260,61 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGE
"/third_party/libwebrtc/modules/desktop_capture/linux/x11/x_window_property.cc"
]
@@ -61172,11 +61147,11 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
]
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
--
-- DEFINES["USE_X11"] = "1"
-- DEFINES["WEBRTC_USE_X11"] = True
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "loongarch64":
+- DEFINES["USE_X11"] = "1"
+- DEFINES["WEBRTC_USE_X11"] = True
+-
- OS_LIBS += [
- "X11",
- "Xcomposite",
@@ -61237,11 +61212,11 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
]
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "ppc64":
-
+-
- DEFINES["USE_X11"] = "1"
- DEFINES["WEBRTC_USE_X11"] = True
--
++if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "ppc64":
+
- OS_LIBS += [
- "X11",
- "Xcomposite",
@@ -61312,10 +61287,10 @@ index 60ff9cd6526d..c14bbe8d54c3 100644
Library("desktop_capture_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
deleted file mode 100644
-index a8051a1743d1..000000000000
+index 6dfb588a9b3e..000000000000
--- third_party/libwebrtc/modules/desktop_capture/desktop_capture_objc_gn/moz.build
+++ /dev/null
-@@ -1,79 +0,0 @@
+@@ -1,80 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -61332,6 +61307,7 @@ index a8051a1743d1..000000000000
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -61396,11 +61372,11 @@ index a8051a1743d1..000000000000
-
-Library("desktop_capture_objc_gn")
diff --git third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-index 6795abb4c898..4b4aca6ade46 100644
+index 72bf241d547a..ad186a14f80e 100644
--- third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
+++ third_party/libwebrtc/modules/desktop_capture/primitives_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -61420,7 +61396,7 @@ index 6795abb4c898..4b4aca6ade46 100644
FINAL_LIBRARY = "xul"
-@@ -49,171 +58,31 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,171 +59,31 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61598,11 +61574,11 @@ index 6795abb4c898..4b4aca6ade46 100644
DEFINES["USE_X11"] = "1"
diff --git third_party/libwebrtc/modules/module_api_gn/moz.build third_party/libwebrtc/modules/module_api_gn/moz.build
-index 60c0ed877863..ab93d8e54775 100644
+index c74dc2329ad2..05900bc205d7 100644
--- third_party/libwebrtc/modules/module_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -61622,7 +61598,7 @@ index 60c0ed877863..ab93d8e54775 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61732,7 +61708,7 @@ index 60c0ed877863..ab93d8e54775 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -61785,11 +61761,11 @@ index 60c0ed877863..ab93d8e54775 100644
-
Library("module_api_gn")
diff --git third_party/libwebrtc/modules/module_api_public_gn/moz.build third_party/libwebrtc/modules/module_api_public_gn/moz.build
-index 2c28b0b1c0ff..b0af3d0bc389 100644
+index 2eda098fe6fe..e83796e2fe16 100644
--- third_party/libwebrtc/modules/module_api_public_gn/moz.build
+++ third_party/libwebrtc/modules/module_api_public_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -61809,7 +61785,7 @@ index 2c28b0b1c0ff..b0af3d0bc389 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -61919,7 +61895,7 @@ index 2c28b0b1c0ff..b0af3d0bc389 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -61972,11 +61948,11 @@ index 2c28b0b1c0ff..b0af3d0bc389 100644
-
Library("module_api_public_gn")
diff --git third_party/libwebrtc/modules/module_fec_api_gn/moz.build third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-index a1eca74eaad1..f8b949dcfe2c 100644
+index d2c1054abbb3..aacac81ad58d 100644
--- third_party/libwebrtc/modules/module_fec_api_gn/moz.build
+++ third_party/libwebrtc/modules/module_fec_api_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -61996,7 +61972,7 @@ index a1eca74eaad1..f8b949dcfe2c 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62106,7 +62082,7 @@ index a1eca74eaad1..f8b949dcfe2c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -62159,11 +62135,11 @@ index a1eca74eaad1..f8b949dcfe2c 100644
-
Library("module_fec_api_gn")
diff --git third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-index 0300737e26a4..c22978c6f96c 100644
+index dbad013ebaab..874ca10c419f 100644
--- third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/interval_budget_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -62183,7 +62159,7 @@ index 0300737e26a4..c22978c6f96c 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62370,11 +62346,11 @@ index 0300737e26a4..c22978c6f96c 100644
Library("interval_budget_gn")
diff --git third_party/libwebrtc/modules/pacing/pacing_gn/moz.build third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-index 484e8af1dfc6..70e970c7d0ce 100644
+index 5c92e55d39bc..9009b4168a4a 100644
--- third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
+++ third_party/libwebrtc/modules/pacing/pacing_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -62394,7 +62370,7 @@ index 484e8af1dfc6..70e970c7d0ce 100644
FINAL_LIBRARY = "xul"
-@@ -50,191 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,191 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62593,11 +62569,11 @@ index 484e8af1dfc6..70e970c7d0ce 100644
Library("pacing_gn")
diff --git third_party/libwebrtc/modules/portal/portal_gn/moz.build third_party/libwebrtc/modules/portal/portal_gn/moz.build
-index 350aa34cf13c..33c52d953465 100644
+index aaaaf5b9fd13..edee670f2d8b 100644
--- third_party/libwebrtc/modules/portal/portal_gn/moz.build
+++ third_party/libwebrtc/modules/portal/portal_gn/moz.build
-@@ -14,21 +14,17 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -25,21 +25,17 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["USE_AURA"] = "1"
@@ -62619,7 +62595,7 @@ index 350aa34cf13c..33c52d953465 100644
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
DEFINES["__STDC_CONSTANT_MACROS"] = True
-@@ -75,16 +71,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -81,16 +77,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
@@ -62636,7 +62612,7 @@ index 350aa34cf13c..33c52d953465 100644
if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
-@@ -102,7 +88,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -108,7 +94,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -62646,11 +62622,11 @@ index 350aa34cf13c..33c52d953465 100644
DEFINES["USE_X11"] = "1"
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
-index 01de5cae11d8..701fdd16c845 100644
+index 0e74f3d662be..6c6ff431f9cd 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/congestion_control_feedback_generator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -62670,7 +62646,7 @@ index 01de5cae11d8..701fdd16c845 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -62868,11 +62844,11 @@ index 01de5cae11d8..701fdd16c845 100644
Library("congestion_control_feedback_generator_gn")
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-index 4047187d2640..b11ca0609ad3 100644
+index 0476715240a8..1f2aa0c4a22a 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -62892,7 +62868,7 @@ index 4047187d2640..b11ca0609ad3 100644
FINAL_LIBRARY = "xul"
-@@ -52,190 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -53,190 +62,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63090,11 +63066,11 @@ index 4047187d2640..b11ca0609ad3 100644
Library("remote_bitrate_estimator_gn")
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
-index 81ce4981cd66..f8ce7a164c83 100644
+index 8a7680e3abc4..e299f01db387 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/rtp_transport_feedback_generator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -63114,7 +63090,7 @@ index 81ce4981cd66..f8ce7a164c83 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63239,7 +63215,7 @@ index 81ce4981cd66..f8ce7a164c83 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -63292,11 +63268,11 @@ index 81ce4981cd66..f8ce7a164c83 100644
-
Library("rtp_transport_feedback_generator_gn")
diff --git third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
-index aeea39d87702..b6549d94ffe7 100644
+index d85dcbe3e6ba..3383c0082bf9 100644
--- third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
+++ third_party/libwebrtc/modules/remote_bitrate_estimator/transport_sequence_number_feedback_generator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -63316,7 +63292,7 @@ index aeea39d87702..b6549d94ffe7 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63514,11 +63490,11 @@ index aeea39d87702..b6549d94ffe7 100644
Library("transport_sequence_number_feedback_generator_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-index 2af40d70ebee..f5a2c0675194 100644
+index e3cb470c6df3..ba3510e10044 100644
--- third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/leb128_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -63538,7 +63514,7 @@ index 2af40d70ebee..f5a2c0675194 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63721,11 +63697,11 @@ index 2af40d70ebee..f5a2c0675194 100644
Library("leb128_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
-index 7fd7cad470d6..b6e083c4dd5f 100644
+index 82b258c97e2a..9413e74bf451 100644
--- third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/ntp_time_util_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -63745,7 +63721,7 @@ index 7fd7cad470d6..b6e083c4dd5f 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -63943,11 +63919,11 @@ index 7fd7cad470d6..b6e083c4dd5f 100644
Library("ntp_time_util_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-index 55763bfa6b82..04b0635746d7 100644
+index aabfc69f25b7..0ea4d705891b 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_format_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -63967,7 +63943,7 @@ index 55763bfa6b82..04b0635746d7 100644
FINAL_LIBRARY = "xul"
-@@ -87,190 +96,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -88,190 +97,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64165,11 +64141,11 @@ index 55763bfa6b82..04b0635746d7 100644
Library("rtp_rtcp_format_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-index b0c5446ca7be..829a5495c9a4 100644
+index 802375393ae2..c3e90068aa32 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_rtcp_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -64189,7 +64165,7 @@ index b0c5446ca7be..829a5495c9a4 100644
FINAL_LIBRARY = "xul"
-@@ -97,191 +106,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -98,191 +107,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64388,11 +64364,11 @@ index b0c5446ca7be..829a5495c9a4 100644
Library("rtp_rtcp_gn")
diff --git third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-index ac0783597427..6dc16af33610 100644
+index 97656d77e72f..601db653d6b4 100644
--- third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
+++ third_party/libwebrtc/modules/rtp_rtcp/rtp_video_header_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -64412,7 +64388,7 @@ index ac0783597427..6dc16af33610 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64606,11 +64582,11 @@ index ac0783597427..6dc16af33610 100644
Library("rtp_video_header_gn")
diff --git third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-index 0d6fa06ae4ab..7e457e9c7fff 100644
+index 1ace30b6be87..a70c2f504f0a 100644
--- third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/fft/fft_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -64630,7 +64606,7 @@ index 0d6fa06ae4ab..7e457e9c7fff 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -64813,11 +64789,11 @@ index 0d6fa06ae4ab..7e457e9c7fff 100644
Library("fft_gn")
diff --git third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-index 212ac260ac44..0148ce7f583f 100644
+index 54f41d0579ad..5c4296426bc2 100644
--- third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g711/g711_3p_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -64837,7 +64813,7 @@ index 212ac260ac44..0148ce7f583f 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65020,11 +64996,11 @@ index 212ac260ac44..0148ce7f583f 100644
Library("g711_3p_gn")
diff --git third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-index 4058bb9c623b..7d993f90b813 100644
+index 1f21b3fea9d8..7a39abd06a9a 100644
--- third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
+++ third_party/libwebrtc/modules/third_party/g722/g722_3p_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -65044,7 +65020,7 @@ index 4058bb9c623b..7d993f90b813 100644
FINAL_LIBRARY = "xul"
-@@ -47,175 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,175 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65227,11 +65203,11 @@ index 4058bb9c623b..7d993f90b813 100644
Library("g722_3p_gn")
diff --git third_party/libwebrtc/modules/utility/utility_gn/moz.build third_party/libwebrtc/modules/utility/utility_gn/moz.build
-index ff98afc45031..0bdce0baa056 100644
+index fa5016332f35..76f5db2df779 100644
--- third_party/libwebrtc/modules/utility/utility_gn/moz.build
+++ third_party/libwebrtc/modules/utility/utility_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -65251,7 +65227,7 @@ index ff98afc45031..0bdce0baa056 100644
FINAL_LIBRARY = "xul"
-@@ -39,116 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,116 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65369,7 +65345,7 @@ index ff98afc45031..0bdce0baa056 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -158,60 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -159,60 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -65432,11 +65408,11 @@ index ff98afc45031..0bdce0baa056 100644
-
Library("utility_gn")
diff --git third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-index 2e93aea47676..2be170137cf5 100644
+index 0bbab186040b..16ac438454b8 100644
--- third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
+++ third_party/libwebrtc/modules/video_capture/video_capture_internal_impl_gn/moz.build
-@@ -14,11 +14,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -18,11 +18,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -65456,7 +65432,7 @@ index 2e93aea47676..2be170137cf5 100644
FINAL_LIBRARY = "xul"
-@@ -33,6 +42,10 @@ LOCAL_INCLUDES += [
+@@ -37,6 +46,10 @@ LOCAL_INCLUDES += [
]
UNIFIED_SOURCES += [
@@ -65467,7 +65443,7 @@ index 2e93aea47676..2be170137cf5 100644
"/third_party/libwebrtc/modules/video_capture/video_capture_options.cc"
]
-@@ -45,153 +58,13 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,170 +62,13 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65617,28 +65593,12 @@ index 2e93aea47676..2be170137cf5 100644
-
- DEFINES["MIPS32_LE"] = True
- DEFINES["MIPS_FPU_LE"] = True
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-- DEFINES["_GNU_SOURCE"] = True
-
- LOCAL_INCLUDES += [
- "/gfx/angle/checkout/include/",
-@@ -210,76 +83,11 @@ if CONFIG["TARGET_CPU"] == "mips32":
- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
- ]
-
--if CONFIG["TARGET_CPU"] == "mips64":
--
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- LOCAL_INCLUDES += [
- "/gfx/angle/checkout/include/",
-- "/third_party/drm/drm/",
-- "/third_party/drm/drm/include/",
-- "/third_party/drm/drm/include/libdrm/",
-- "/third_party/gbm/gbm/",
-- "/third_party/libepoxy/libepoxy/include/",
-- "/third_party/pipewire/"
+- "/third_party/libepoxy/libepoxy/include/"
- ]
-
- UNIFIED_SOURCES += [
@@ -65648,6 +65608,17 @@ index 2e93aea47676..2be170137cf5 100644
- "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
- ]
-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+- DEFINES["_GNU_SOURCE"] = True
+
+ LOCAL_INCLUDES += [
+ "/gfx/angle/checkout/include/",
+@@ -226,54 +82,11 @@ if CONFIG["TARGET_CPU"] == "mips64":
+ "/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
+ ]
+
-if CONFIG["TARGET_CPU"] == "x86":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -65702,7 +65673,7 @@ index 2e93aea47676..2be170137cf5 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -298,10 +106,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
+@@ -287,10 +100,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -65714,7 +65685,7 @@ index 2e93aea47676..2be170137cf5 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -320,14 +127,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
+@@ -304,14 +116,14 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -65731,7 +65702,7 @@ index 2e93aea47676..2be170137cf5 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -346,10 +153,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -325,10 +137,10 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -65744,7 +65715,7 @@ index 2e93aea47676..2be170137cf5 100644
LOCAL_INCLUDES += [
"/gfx/angle/checkout/include/",
-@@ -368,4 +175,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -342,4 +154,8 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
"/third_party/libwebrtc/modules/video_capture/linux/video_capture_pipewire.cc"
]
@@ -65754,11 +65725,11 @@ index 2e93aea47676..2be170137cf5 100644
+
Library("video_capture_internal_impl_gn")
diff --git third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-index 8eb64eb08f2b..7df621b28fa4 100644
+index 63ea4f06c231..0a5aa0faeb03 100644
--- third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
+++ third_party/libwebrtc/modules/video_capture/video_capture_module_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -65778,7 +65749,7 @@ index 8eb64eb08f2b..7df621b28fa4 100644
FINAL_LIBRARY = "xul"
-@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,190 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -65976,11 +65947,11 @@ index 8eb64eb08f2b..7df621b28fa4 100644
Library("video_capture_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-index 5937538364f0..f620f14e0914 100644
+index 2df6e3909ab8..db15b3bf5bca 100644
--- third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/chain_diff_calculator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -66000,7 +65971,7 @@ index 5937538364f0..f620f14e0914 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66194,11 +66165,11 @@ index 5937538364f0..f620f14e0914 100644
Library("chain_diff_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-index 0e376beeb43f..5b2293a8c2a6 100644
+index 45a85d4689af..7524313fb884 100644
--- third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codec_globals_headers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -66218,7 +66189,7 @@ index 0e376beeb43f..5b2293a8c2a6 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66332,7 +66303,7 @@ index 0e376beeb43f..5b2293a8c2a6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -66385,11 +66356,11 @@ index 0e376beeb43f..5b2293a8c2a6 100644
-
Library("codec_globals_headers_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-index fada35453906..bd504c7f3aab 100644
+index 2fece80bce22..9fe0c94db192 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/av1_svc_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -66409,7 +66380,7 @@ index fada35453906..bd504c7f3aab 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66603,11 +66574,11 @@ index fada35453906..bd504c7f3aab 100644
Library("av1_svc_config_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-index 24fa539a5cab..a188413dc48b 100644
+index 838868858004..04f426de8930 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/dav1d_decoder_gn/moz.build
-@@ -15,11 +15,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,11 +16,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -66627,7 +66598,7 @@ index 24fa539a5cab..a188413dc48b 100644
FINAL_LIBRARY = "xul"
-@@ -50,186 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,186 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -66821,11 +66792,11 @@ index 24fa539a5cab..a188413dc48b 100644
Library("dav1d_decoder_gn")
diff --git third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-index 24ceefe34957..eff195ec2131 100644
+index 7ebe8089b1b2..0ef5c393600b 100644
--- third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/codecs/av1/libaom_av1_encoder_gn/moz.build
-@@ -15,11 +15,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,11 +16,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -66845,7 +66816,7 @@ index 24ceefe34957..eff195ec2131 100644
FINAL_LIBRARY = "xul"
-@@ -46,190 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,190 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67043,11 +67014,11 @@ index 24ceefe34957..eff195ec2131 100644
Library("aom_av1_encoder_gn")
diff --git third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-index e58cb936c199..6782dfdfe553 100644
+index ee69c451a535..6416e975e2f7 100644
--- third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/encoded_frame_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -67067,7 +67038,7 @@ index e58cb936c199..6782dfdfe553 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67265,11 +67236,11 @@ index e58cb936c199..6782dfdfe553 100644
Library("encoded_frame_gn")
diff --git third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-index 0f2412610dbf..e5bb732bbb88 100644
+index aa42f12b7b5b..40f1449e2b22 100644
--- third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_dependencies_calculator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -67289,7 +67260,7 @@ index 0f2412610dbf..e5bb732bbb88 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67483,11 +67454,11 @@ index 0f2412610dbf..e5bb732bbb88 100644
Library("frame_dependencies_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-index 60b5c7b7ece6..61c30cb5584e 100644
+index ab164d5d921f..fe1dd7c20635 100644
--- third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/frame_helpers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -67507,7 +67478,7 @@ index 60b5c7b7ece6..61c30cb5584e 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67701,11 +67672,11 @@ index 60b5c7b7ece6..61c30cb5584e 100644
Library("frame_helpers_gn")
diff --git third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
-index ade14f4e1b82..533519d32835 100644
+index 6527c200d000..e5dd51284982 100644
--- third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/h264_sprop_parameter_sets_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -67725,7 +67696,7 @@ index ade14f4e1b82..533519d32835 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -67919,11 +67890,11 @@ index ade14f4e1b82..533519d32835 100644
Library("h264_sprop_parameter_sets_gn")
diff --git third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
-index 011e05c41a35..4c0a79157158 100644
+index cde385e9a546..5f57f69fd4a0 100644
--- third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/h26x_packet_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -67943,7 +67914,7 @@ index 011e05c41a35..4c0a79157158 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68141,11 +68112,11 @@ index 011e05c41a35..4c0a79157158 100644
Library("h26x_packet_buffer_gn")
diff --git third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-index bdb63a278c1a..876704e1108a 100644
+index 84955a5ef85a..4a468f527ed4 100644
--- third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/nack_requester_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -68165,7 +68136,7 @@ index bdb63a278c1a..876704e1108a 100644
FINAL_LIBRARY = "xul"
-@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,190 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68363,11 +68334,11 @@ index bdb63a278c1a..876704e1108a 100644
Library("nack_requester_gn")
diff --git third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-index cceabc3a79be..10def6584884 100644
+index 1376ef845e41..d4f7694767ba 100644
--- third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/packet_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -68387,7 +68358,7 @@ index cceabc3a79be..10def6584884 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68585,11 +68556,11 @@ index cceabc3a79be..10def6584884 100644
Library("packet_buffer_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-index bc20befd0715..899b8b26696b 100644
+index 59753f7db18e..f305df0162af 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalability_mode_util_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -68609,7 +68580,7 @@ index bc20befd0715..899b8b26696b 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -68803,11 +68774,11 @@ index bc20befd0715..899b8b26696b 100644
Library("scalability_mode_util_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-index a16034b3b02e..d6ba49e4f848 100644
+index 0e0a68b5126f..40ba86c82948 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalability_structures_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -68827,7 +68798,7 @@ index a16034b3b02e..d6ba49e4f848 100644
FINAL_LIBRARY = "xul"
-@@ -50,186 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -51,186 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69021,11 +68992,11 @@ index a16034b3b02e..d6ba49e4f848 100644
Library("scalability_structures_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-index 1217d027bd0c..be3d0562194c 100644
+index 518157bf6a3a..728277abedb9 100644
--- third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/scalable_video_controller_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -69045,7 +69016,7 @@ index 1217d027bd0c..be3d0562194c 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69232,11 +69203,11 @@ index 1217d027bd0c..be3d0562194c 100644
Library("scalable_video_controller_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
-index 1c9b143c6d78..c542cfb06869 100644
+index 7beea9790f44..0b566d46220f 100644
--- third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/simulcast_to_svc_converter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -69256,7 +69227,7 @@ index 1c9b143c6d78..c542cfb06869 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69455,11 +69426,11 @@ index 1c9b143c6d78..c542cfb06869 100644
Library("simulcast_to_svc_converter_gn")
diff --git third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-index 1f4d5e0258d8..0c39b0372a4c 100644
+index f2d5174579d7..70b9e280ac69 100644
--- third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/svc/svc_rate_allocator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -69479,7 +69450,7 @@ index 1f4d5e0258d8..0c39b0372a4c 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69673,11 +69644,11 @@ index 1f4d5e0258d8..0c39b0372a4c 100644
Library("svc_rate_allocator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-index a1f79bc336d3..46a3f3c27eb7 100644
+index 7896f5bc23b7..5351ae8eecb7 100644
--- third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/decode_time_percentile_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -69697,7 +69668,7 @@ index a1f79bc336d3..46a3f3c27eb7 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -69884,11 +69855,11 @@ index a1f79bc336d3..46a3f3c27eb7 100644
Library("decode_time_percentile_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-index 236158a0edad..cede417ed2c0 100644
+index 888feb78f5b1..94877208edd6 100644
--- third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/frame_delay_variation_kalman_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -69908,7 +69879,7 @@ index 236158a0edad..cede417ed2c0 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70095,11 +70066,11 @@ index 236158a0edad..cede417ed2c0 100644
Library("frame_delay_variation_kalman_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-index 46b966db475b..e680f19b417f 100644
+index 90271d97710b..a89880e80b11 100644
--- third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/inter_frame_delay_variation_calculator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -70119,7 +70090,7 @@ index 46b966db475b..e680f19b417f 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70306,11 +70277,11 @@ index 46b966db475b..e680f19b417f 100644
Library("inter_frame_delay_variation_calculator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-index e5ab643a0837..3956e5fb7141 100644
+index 52b5cc106deb..c1b20efbd861 100644
--- third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/jitter_estimator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -70330,7 +70301,7 @@ index e5ab643a0837..3956e5fb7141 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70528,11 +70499,11 @@ index e5ab643a0837..3956e5fb7141 100644
Library("jitter_estimator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-index 018a8b4baf38..e8117da97d09 100644
+index 0e4c9ed34eec..bbd2ef7b0051 100644
--- third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/rtt_filter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -70552,7 +70523,7 @@ index 018a8b4baf38..e8117da97d09 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70739,11 +70710,11 @@ index 018a8b4baf38..e8117da97d09 100644
Library("rtt_filter_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-index 6b0a5bd11fe1..62189b4f8b6f 100644
+index 91f53af3cd95..4039bf1225e2 100644
--- third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/timestamp_extrapolator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -70763,7 +70734,7 @@ index 6b0a5bd11fe1..62189b4f8b6f 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -70950,11 +70921,11 @@ index 6b0a5bd11fe1..62189b4f8b6f 100644
Library("timestamp_extrapolator_gn")
diff --git third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-index 2c399005d50a..73a1afbc3010 100644
+index 5a1fc368549b..ae936de55ec9 100644
--- third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/timing/timing_module_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -70974,7 +70945,7 @@ index 2c399005d50a..73a1afbc3010 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71172,11 +71143,11 @@ index 2c399005d50a..73a1afbc3010 100644
Library("timing_module_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-index 5f424f15c3eb..43a9bb659cbc 100644
+index 897eac22a94f..8124fea57658 100644
--- third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_codec_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -71196,7 +71167,7 @@ index 5f424f15c3eb..43a9bb659cbc 100644
FINAL_LIBRARY = "xul"
-@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,186 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71390,11 +71361,11 @@ index 5f424f15c3eb..43a9bb659cbc 100644
Library("video_codec_interface_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-index f12701855e1a..04bb63314cc3 100644
+index 3ce6a18faa6b..2f30227606e2 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -71414,7 +71385,7 @@ index f12701855e1a..04bb63314cc3 100644
FINAL_LIBRARY = "xul"
-@@ -56,191 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,191 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71613,11 +71584,11 @@ index f12701855e1a..04bb63314cc3 100644
Library("video_coding_gn")
diff --git third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-index 51f84c774238..c7cad0188c20 100644
+index 68fc0eae62dc..62b651290610 100644
--- third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/video_coding_utility_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -71637,7 +71608,7 @@ index 51f84c774238..c7cad0188c20 100644
FINAL_LIBRARY = "xul"
-@@ -55,191 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -56,191 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -71836,11 +71807,11 @@ index 51f84c774238..c7cad0188c20 100644
Library("video_coding_utility_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-index c67f86066d95..2c584fade5d5 100644
+index 104bcded2bc7..ff4ed9fb888a 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_h264_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -71860,7 +71831,7 @@ index c67f86066d95..2c584fade5d5 100644
FINAL_LIBRARY = "xul"
-@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,191 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72059,11 +72030,11 @@ index c67f86066d95..2c584fade5d5 100644
Library("webrtc_h264_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-index 9272a224c583..aa55521fb1a8 100644
+index efede3512ed7..af759b9e2900 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_libvpx_interface_gn/moz.build
-@@ -15,11 +15,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,11 +16,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -72083,7 +72054,7 @@ index 9272a224c583..aa55521fb1a8 100644
FINAL_LIBRARY = "xul"
-@@ -46,179 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,179 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72270,11 +72241,11 @@ index 9272a224c583..aa55521fb1a8 100644
Library("webrtc_libvpx_interface_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-index aea179a464fa..91d251da69da 100644
+index 8c4f08bc82b5..7c863a57e8a8 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_gn/moz.build
-@@ -15,11 +15,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,11 +16,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -72294,7 +72265,7 @@ index aea179a464fa..91d251da69da 100644
FINAL_LIBRARY = "xul"
-@@ -49,191 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -50,191 +59,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72493,11 +72464,11 @@ index aea179a464fa..91d251da69da 100644
Library("webrtc_vp8_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-index 1e543688ce0a..f599b8e6fe2c 100644
+index edf7e7b28f4f..9c7e190a11b4 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_scalability_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -72517,7 +72488,7 @@ index 1e543688ce0a..f599b8e6fe2c 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72704,11 +72675,11 @@ index 1e543688ce0a..f599b8e6fe2c 100644
Library("webrtc_vp8_scalability_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-index 76d68e59a807..7bcdfba72a3d 100644
+index c92c78084ff3..3a5fb1aa4598 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp8_temporal_layers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -72728,7 +72699,7 @@ index 76d68e59a807..7bcdfba72a3d 100644
FINAL_LIBRARY = "xul"
-@@ -48,191 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -49,191 +58,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -72927,11 +72898,11 @@ index 76d68e59a807..7bcdfba72a3d 100644
Library("webrtc_vp8_temporal_layers_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-index d807360bfdb9..69fea357b30b 100644
+index ec4a3d7388f7..e891dd8b547f 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_gn/moz.build
-@@ -15,11 +15,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -16,11 +16,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -72951,7 +72922,7 @@ index d807360bfdb9..69fea357b30b 100644
FINAL_LIBRARY = "xul"
-@@ -51,191 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,191 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73150,11 +73121,11 @@ index d807360bfdb9..69fea357b30b 100644
Library("webrtc_vp9_gn")
diff --git third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-index a734c18d2ccf..42f79acec164 100644
+index f8968c342f27..064b0b18e98c 100644
--- third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
+++ third_party/libwebrtc/modules/video_coding/webrtc_vp9_helpers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -73174,7 +73145,7 @@ index a734c18d2ccf..42f79acec164 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73368,7 +73339,7 @@ index a734c18d2ccf..42f79acec164 100644
Library("webrtc_vp9_helpers_gn")
diff --git third_party/libwebrtc/moz.build third_party/libwebrtc/moz.build
-index fb93b2ab5309..08ce55822bf1 100644
+index a45cc7826c9c..c4140609a28f 100644
--- third_party/libwebrtc/moz.build
+++ third_party/libwebrtc/moz.build
@@ -291,6 +291,8 @@ DIRS += [
@@ -73380,7 +73351,7 @@ index fb93b2ab5309..08ce55822bf1 100644
"/third_party/libwebrtc/modules/module_api_gn",
"/third_party/libwebrtc/modules/module_api_public_gn",
"/third_party/libwebrtc/modules/module_fec_api_gn",
-@@ -517,102 +519,11 @@ DIRS += [
+@@ -517,137 +519,30 @@ DIRS += [
"/third_party/libwebrtc/webrtc_gn"
]
@@ -73482,10 +73453,7 @@ index fb93b2ab5309..08ce55822bf1 100644
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
- "/third_party/libwebrtc/third_party/drm/drm_gn",
- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -620,26 +531,19 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
+ "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn"
]
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
@@ -73496,55 +73464,43 @@ index fb93b2ab5309..08ce55822bf1 100644
- "/third_party/libwebrtc/common_audio/common_audio_neon_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
- "/third_party/libwebrtc/modules/portal/portal_gn",
+- "/third_party/libwebrtc/modules/portal/portal_gn",
- "/third_party/libwebrtc/rtc_base/system/asm_defines_gn",
- "/third_party/libwebrtc/third_party/drm/drm_gn",
- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
+- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn"
+- ]
+-
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
+-
+- DIRS += [
+- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
+- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
+ "/third_party/libwebrtc/modules/portal/portal_gn",
+ "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn"
]
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
+-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
+if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "mips64":
DIRS += [
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
- "/third_party/libwebrtc/third_party/drm/drm_gn",
- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -647,19 +551,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips32":
- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
+ "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn"
]
--if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "mips64":
--
-- DIRS += [
-- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
-- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
-- "/third_party/libwebrtc/modules/portal/portal_gn",
-- "/third_party/libwebrtc/third_party/drm/drm_gn",
-- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
-- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
-- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+if CONFIG["OS_TARGET"] == "FreeBSD" and CONFIG["TARGET_CPU"] == "x86":
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -667,8 +559,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
+@@ -655,13 +550,11 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
- "/third_party/libwebrtc/third_party/drm/drm_gn",
- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
-@@ -676,7 +566,7 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
+ "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn"
]
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
@@ -73552,17 +73508,14 @@ index fb93b2ab5309..08ce55822bf1 100644
DIRS += [
"/third_party/libwebrtc/common_audio/common_audio_avx2_gn",
-@@ -684,76 +574,9 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
+@@ -669,73 +562,6 @@ if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
"/third_party/libwebrtc/modules/audio_processing/aec3/aec3_avx2_gn",
"/third_party/libwebrtc/modules/audio_processing/agc2/rnn_vad/vector_math_avx2_gn",
"/third_party/libwebrtc/modules/desktop_capture/desktop_capture_differ_sse2_gn",
- "/third_party/libwebrtc/modules/desktop_capture/desktop_capture_gn",
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn",
"/third_party/libwebrtc/modules/portal/portal_gn",
- "/third_party/libwebrtc/third_party/drm/drm_gn",
- "/third_party/libwebrtc/third_party/gbm/gbm_gn",
- "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn",
- "/third_party/libwebrtc/third_party/pipewire/pipewire_gn"
+ "/third_party/libwebrtc/third_party/libepoxy/libepoxy_gn"
]
-
-if CONFIG["OS_TARGET"] == "OpenBSD" and CONFIG["TARGET_CPU"] == "aarch64":
@@ -73630,11 +73583,11 @@ index fb93b2ab5309..08ce55822bf1 100644
- "/third_party/libwebrtc/modules/desktop_capture/primitives_gn"
- ]
diff --git third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
-index eca892f4b02e..c528241420bd 100644
+index 6a5e4cfebe25..37b925ca7c54 100644
--- third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/common/internal_types_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -73654,7 +73607,7 @@ index eca892f4b02e..c528241420bd 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73768,7 +73721,7 @@ index eca892f4b02e..c528241420bd 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -73821,11 +73774,11 @@ index eca892f4b02e..c528241420bd 100644
-
Library("internal_types_gn")
diff --git third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
-index 31a8282c2e53..bf7cde0c5a6b 100644
+index c3cb187e2306..a545273adb9f 100644
--- third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/common/math_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -73845,7 +73798,7 @@ index 31a8282c2e53..bf7cde0c5a6b 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -73955,7 +73908,7 @@ index 31a8282c2e53..bf7cde0c5a6b 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -74008,11 +73961,11 @@ index 31a8282c2e53..bf7cde0c5a6b 100644
-
Library("math_gn")
diff --git third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
-index a846f1a0d33d..4c0fce5d6266 100644
+index c94cad55dd86..a3efde5199ae 100644
--- third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/common/sequence_numbers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -74032,7 +73985,7 @@ index a846f1a0d33d..4c0fce5d6266 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74146,7 +74099,7 @@ index a846f1a0d33d..4c0fce5d6266 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -74199,11 +74152,11 @@ index a846f1a0d33d..4c0fce5d6266 100644
-
Library("sequence_numbers_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
-index afa02fd16c4f..6b6ba69cc8b2 100644
+index b80cd74c33f8..2349cc2c46c5 100644
--- third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/bounded_io_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -74223,7 +74176,7 @@ index afa02fd16c4f..6b6ba69cc8b2 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74337,7 +74290,7 @@ index afa02fd16c4f..6b6ba69cc8b2 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -74390,11 +74343,11 @@ index afa02fd16c4f..6b6ba69cc8b2 100644
-
Library("bounded_io_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
-index 0b444ee87f8f..0b6864a3f398 100644
+index f7520a41a0ea..8a97ab477627 100644
--- third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/chunk_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -74414,7 +74367,7 @@ index 0b444ee87f8f..0b6864a3f398 100644
FINAL_LIBRARY = "xul"
-@@ -60,186 +69,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -61,186 +70,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74608,11 +74561,11 @@ index 0b444ee87f8f..0b6864a3f398 100644
Library("chunk_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
-index 98062c27066e..c19e934effcf 100644
+index 0a06a330808a..b38a8e170736 100644
--- third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/chunk_validators_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -74632,7 +74585,7 @@ index 98062c27066e..c19e934effcf 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -74826,11 +74779,11 @@ index 98062c27066e..c19e934effcf 100644
Library("chunk_validators_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
-index 70f2f245242b..6db407d3c392 100644
+index 7babd4f00c8d..3544b8accf94 100644
--- third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/crc32c_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -74850,7 +74803,7 @@ index 70f2f245242b..6db407d3c392 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75037,11 +74990,11 @@ index 70f2f245242b..6db407d3c392 100644
Library("crc32c_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
-index 7ecb713c4107..a7bee1d658c9 100644
+index 56a67c706fa4..6921e2bc087f 100644
--- third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/data_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -75061,7 +75014,7 @@ index 7ecb713c4107..a7bee1d658c9 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75175,7 +75128,7 @@ index 7ecb713c4107..a7bee1d658c9 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -75228,11 +75181,11 @@ index 7ecb713c4107..a7bee1d658c9 100644
-
Library("data_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
-index 6a16d627ed56..a4c0982bd786 100644
+index 04ca98c30fab..005f3ed8633a 100644
--- third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/error_cause_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -75252,7 +75205,7 @@ index 6a16d627ed56..a4c0982bd786 100644
FINAL_LIBRARY = "xul"
-@@ -56,186 +65,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -57,186 +66,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75446,11 +75399,11 @@ index 6a16d627ed56..a4c0982bd786 100644
Library("error_cause_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
-index 4502dede2e9a..0735d8a5c65b 100644
+index a1beb0f7c208..5a45e729c554 100644
--- third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/parameter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -75470,7 +75423,7 @@ index 4502dede2e9a..0735d8a5c65b 100644
FINAL_LIBRARY = "xul"
-@@ -54,186 +63,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -55,186 +64,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75664,11 +75617,11 @@ index 4502dede2e9a..0735d8a5c65b 100644
Library("parameter_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
-index 3b65e2e1c551..1033c5c1c02c 100644
+index 8940c608e991..2cba46b3bef8 100644
--- third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/sctp_packet_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -75688,7 +75641,7 @@ index 3b65e2e1c551..1033c5c1c02c 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -75882,11 +75835,11 @@ index 3b65e2e1c551..1033c5c1c02c 100644
Library("sctp_packet_gn")
diff --git third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
-index 7760bdab3371..785c32caee3d 100644
+index 8ac207cfe1c5..3a4c616d2424 100644
--- third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/packet/tlv_trait_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -75906,7 +75859,7 @@ index 7760bdab3371..785c32caee3d 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76100,11 +76053,11 @@ index 7760bdab3371..785c32caee3d 100644
Library("tlv_trait_gn")
diff --git third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
-index d5c44cd7f55d..8130510f9f5c 100644
+index 2126af302d7b..25ce5477486d 100644
--- third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/public/factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -76124,7 +76077,7 @@ index d5c44cd7f55d..8130510f9f5c 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76318,11 +76271,11 @@ index d5c44cd7f55d..8130510f9f5c 100644
Library("factory_gn")
diff --git third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
-index 17e62497fbfd..e972e6822983 100644
+index f65d94f80dca..a07bcaae7738 100644
--- third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/public/socket_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -76342,7 +76295,7 @@ index 17e62497fbfd..e972e6822983 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76529,11 +76482,11 @@ index 17e62497fbfd..e972e6822983 100644
Library("socket_gn")
diff --git third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
-index b7af89b0851d..0a2272a27689 100644
+index 1b974d0796d6..738f80ce6793 100644
--- third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/public/types_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -76553,7 +76506,7 @@ index b7af89b0851d..0a2272a27689 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76667,7 +76620,7 @@ index b7af89b0851d..0a2272a27689 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -76720,11 +76673,11 @@ index b7af89b0851d..0a2272a27689 100644
-
Library("types_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
-index ed06ee415f8e..312e54212c64 100644
+index 5276459a3feb..16efcdf3f232 100644
--- third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/data_tracker_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -76744,7 +76697,7 @@ index ed06ee415f8e..312e54212c64 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -76938,11 +76891,11 @@ index ed06ee415f8e..312e54212c64 100644
Library("data_tracker_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
-index 7db6319dfaa8..ed90dc7cc461 100644
+index 319c63c7eb91..e6d7a638ec76 100644
--- third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/interleaved_reassembly_streams_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -76962,7 +76915,7 @@ index 7db6319dfaa8..ed90dc7cc461 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77156,11 +77109,11 @@ index 7db6319dfaa8..ed90dc7cc461 100644
Library("interleaved_reassembly_streams_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
-index efa360452257..befef0bbe4f5 100644
+index cdb84f7d102c..06f189fb7b51 100644
--- third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/reassembly_queue_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -77180,7 +77133,7 @@ index efa360452257..befef0bbe4f5 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77374,11 +77327,11 @@ index efa360452257..befef0bbe4f5 100644
Library("reassembly_queue_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
-index b829e624d36a..6363d35c7972 100644
+index 6c398b133ee0..fd95d137655b 100644
--- third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/reassembly_streams_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -77398,7 +77351,7 @@ index b829e624d36a..6363d35c7972 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77519,7 +77472,7 @@ index b829e624d36a..6363d35c7972 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -77572,11 +77525,11 @@ index b829e624d36a..6363d35c7972 100644
-
Library("reassembly_streams_gn")
diff --git third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
-index f8e03b62eb88..c410a12e3122 100644
+index dea3f1d04e9c..4da538440a2a 100644
--- third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/rx/traditional_reassembly_streams_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -77596,7 +77549,7 @@ index f8e03b62eb88..c410a12e3122 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77790,11 +77743,11 @@ index f8e03b62eb88..c410a12e3122 100644
Library("traditional_reassembly_streams_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
-index d6ae65b02e63..5c343e4e3e30 100644
+index 1412fe4b2580..51f4925bb9e5 100644
--- third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/context_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -77814,7 +77767,7 @@ index d6ae65b02e63..5c343e4e3e30 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -77935,7 +77888,7 @@ index d6ae65b02e63..5c343e4e3e30 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -77988,11 +77941,11 @@ index d6ae65b02e63..5c343e4e3e30 100644
-
Library("context_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
-index 5077ef17d6e3..afac7802f8e3 100644
+index b5f74c59485f..fc81bd30b2b8 100644
--- third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/dcsctp_socket_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -78012,7 +77965,7 @@ index 5077ef17d6e3..afac7802f8e3 100644
FINAL_LIBRARY = "xul"
-@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,186 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78206,11 +78159,11 @@ index 5077ef17d6e3..afac7802f8e3 100644
Library("dcsctp_socket_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
-index 754c30dabf4b..43c70d03ca46 100644
+index 0a9c0ad00ea5..19c7c7c852fa 100644
--- third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/heartbeat_handler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -78230,7 +78183,7 @@ index 754c30dabf4b..43c70d03ca46 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78424,11 +78377,11 @@ index 754c30dabf4b..43c70d03ca46 100644
Library("heartbeat_handler_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
-index 4473e5cdb86d..ef16a31312b8 100644
+index ed127c2a2056..1bc00bd677ad 100644
--- third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/packet_sender_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -78448,7 +78401,7 @@ index 4473e5cdb86d..ef16a31312b8 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78642,11 +78595,11 @@ index 4473e5cdb86d..ef16a31312b8 100644
Library("packet_sender_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
-index f740f1e2814a..66d5e7387bb3 100644
+index 49714f1804f3..fca2c697c710 100644
--- third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/stream_reset_handler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -78666,7 +78619,7 @@ index f740f1e2814a..66d5e7387bb3 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -78860,11 +78813,11 @@ index f740f1e2814a..66d5e7387bb3 100644
Library("stream_reset_handler_gn")
diff --git third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
-index 2f57383eed74..ab7a50de0e71 100644
+index be93efb070fb..b780282e8e46 100644
--- third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/socket/transmission_control_block_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -78884,7 +78837,7 @@ index 2f57383eed74..ab7a50de0e71 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79078,11 +79031,11 @@ index 2f57383eed74..ab7a50de0e71 100644
Library("transmission_control_block_gn")
diff --git third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
-index 92d96b5a4884..b8f118fa70e9 100644
+index 19e9a8ae4cb0..ee7ab28bbb77 100644
--- third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/timer/task_queue_timeout_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -79102,7 +79055,7 @@ index 92d96b5a4884..b8f118fa70e9 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79296,11 +79249,11 @@ index 92d96b5a4884..b8f118fa70e9 100644
Library("task_queue_timeout_gn")
diff --git third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
-index e72d318f368b..5e9b0f5f076e 100644
+index fc21b96cb95e..92d3bad017da 100644
--- third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/timer/timer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -79320,7 +79273,7 @@ index e72d318f368b..5e9b0f5f076e 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79507,11 +79460,11 @@ index e72d318f368b..5e9b0f5f076e 100644
Library("timer_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
-index db4877c0eb5a..bee7fe1717f9 100644
+index d6f0efb0e95e..d9f2acafec11 100644
--- third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/outstanding_data_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -79531,7 +79484,7 @@ index db4877c0eb5a..bee7fe1717f9 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79725,11 +79678,11 @@ index db4877c0eb5a..bee7fe1717f9 100644
Library("outstanding_data_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
-index 1d65b2c48361..633445df7694 100644
+index e4c78b2b27c0..f24cfb2e48ec 100644
--- third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/retransmission_error_counter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -79749,7 +79702,7 @@ index 1d65b2c48361..633445df7694 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -79943,11 +79896,11 @@ index 1d65b2c48361..633445df7694 100644
Library("retransmission_error_counter_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
-index 7b314599a9ba..1b8bec53706d 100644
+index 94099b89bbc9..d4eef73f4081 100644
--- third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/retransmission_queue_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -79967,7 +79920,7 @@ index 7b314599a9ba..1b8bec53706d 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80161,11 +80114,11 @@ index 7b314599a9ba..1b8bec53706d 100644
Library("retransmission_queue_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
-index 65d68e087729..c5164b6718d3 100644
+index b3cc98e36fcb..7e95c8f18e3d 100644
--- third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/retransmission_timeout_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -80185,7 +80138,7 @@ index 65d68e087729..c5164b6718d3 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80372,11 +80325,11 @@ index 65d68e087729..c5164b6718d3 100644
Library("retransmission_timeout_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
-index 1cb8bd431eaa..9ea25738de8c 100644
+index 0930a4d36c9f..271a2fd7a9a7 100644
--- third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/rr_send_queue_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -80396,7 +80349,7 @@ index 1cb8bd431eaa..9ea25738de8c 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80590,11 +80543,11 @@ index 1cb8bd431eaa..9ea25738de8c 100644
Library("rr_send_queue_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
-index 103522c30ecf..f78f753430a9 100644
+index 53637eff6663..a227ea7ffca7 100644
--- third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/send_queue_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -80614,7 +80567,7 @@ index 103522c30ecf..f78f753430a9 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -80735,7 +80688,7 @@ index 103522c30ecf..f78f753430a9 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -80788,11 +80741,11 @@ index 103522c30ecf..f78f753430a9 100644
-
Library("send_queue_gn")
diff --git third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
-index 1617cd052cfb..1918ce77f1a0 100644
+index 664394c22b67..0e1f5e52ab80 100644
--- third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
+++ third_party/libwebrtc/net/dcsctp/tx/stream_scheduler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -80812,7 +80765,7 @@ index 1617cd052cfb..1918ce77f1a0 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81006,11 +80959,11 @@ index 1617cd052cfb..1918ce77f1a0 100644
Library("stream_scheduler_gn")
diff --git third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-index 07281aa318a7..2a5a0f61c3c3 100644
+index ebe2d31f76cb..4273164eb8ae 100644
--- third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_dns_resolver_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -81030,7 +80983,7 @@ index 07281aa318a7..2a5a0f61c3c3 100644
FINAL_LIBRARY = "xul"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81225,11 +81178,11 @@ index 07281aa318a7..2a5a0f61c3c3 100644
Library("async_dns_resolver_gn")
diff --git third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
-index 59de36d84d9a..1dc426614ba0 100644
+index 0739957773e6..99cb949dca52 100644
--- third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/async_packet_socket_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -81249,7 +81202,7 @@ index 59de36d84d9a..1dc426614ba0 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81359,7 +81312,7 @@ index 59de36d84d9a..1dc426614ba0 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -81412,11 +81365,11 @@ index 59de36d84d9a..1dc426614ba0 100644
-
Library("async_packet_socket_gn")
diff --git third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-index 2bb40d7b400d..59b686b72228 100644
+index dde6dc9d8144..be4e6cad1dbd 100644
--- third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
+++ third_party/libwebrtc/rtc_base/audio_format_to_string_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -81436,7 +81389,7 @@ index 2bb40d7b400d..59b686b72228 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81630,11 +81583,11 @@ index 2bb40d7b400d..59b686b72228 100644
Library("audio_format_to_string_gn")
diff --git third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-index a97cbd0f0e4b..a183036f9f29 100644
+index ef6a31fb5e9b..67ba86b45fdf 100644
--- third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bit_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -81654,7 +81607,7 @@ index a97cbd0f0e4b..a183036f9f29 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -81841,11 +81794,11 @@ index a97cbd0f0e4b..a183036f9f29 100644
Library("bit_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-index 48ec1d8b394a..bb90b19b5ef7 100644
+index e98692d2e7b7..45ab9ef5afd1 100644
--- third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bitrate_tracker_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -81865,7 +81818,7 @@ index 48ec1d8b394a..bb90b19b5ef7 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82059,11 +82012,11 @@ index 48ec1d8b394a..bb90b19b5ef7 100644
Library("bitrate_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-index b6e5cdc25679..f2785c8a470b 100644
+index 41bb6e4e0ee4..c8612822886c 100644
--- third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
+++ third_party/libwebrtc/rtc_base/bitstream_reader_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -82083,7 +82036,7 @@ index b6e5cdc25679..f2785c8a470b 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82270,11 +82223,11 @@ index b6e5cdc25679..f2785c8a470b 100644
Library("bitstream_reader_gn")
diff --git third_party/libwebrtc/rtc_base/buffer_gn/moz.build third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-index cb8c70cd12d1..627182b344f7 100644
+index 896456d6ec99..534605ccf4e2 100644
--- third_party/libwebrtc/rtc_base/buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -82294,7 +82247,7 @@ index cb8c70cd12d1..627182b344f7 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82408,7 +82361,7 @@ index cb8c70cd12d1..627182b344f7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82461,11 +82414,11 @@ index cb8c70cd12d1..627182b344f7 100644
-
Library("buffer_gn")
diff --git third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-index 53412c151689..d57286760dc5 100644
+index efa39af67ca2..4fbf51d84dd6 100644
--- third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -82485,7 +82438,7 @@ index 53412c151689..d57286760dc5 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82672,11 +82625,11 @@ index 53412c151689..d57286760dc5 100644
Library("byte_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/byte_order_gn/moz.build third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-index eb8960e92dc5..b483351cb849 100644
+index ce685d4814d2..65ab76218c6c 100644
--- third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
+++ third_party/libwebrtc/rtc_base/byte_order_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -82696,7 +82649,7 @@ index eb8960e92dc5..b483351cb849 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -82806,7 +82759,7 @@ index eb8960e92dc5..b483351cb849 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -82859,11 +82812,11 @@ index eb8960e92dc5..b483351cb849 100644
-
Library("byte_order_gn")
diff --git third_party/libwebrtc/rtc_base/checks_gn/moz.build third_party/libwebrtc/rtc_base/checks_gn/moz.build
-index 4009fff6361f..bac79efc3909 100644
+index 1f38f2ca7a4f..2e0f0e8b7744 100644
--- third_party/libwebrtc/rtc_base/checks_gn/moz.build
+++ third_party/libwebrtc/rtc_base/checks_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -82883,7 +82836,7 @@ index 4009fff6361f..bac79efc3909 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83070,11 +83023,11 @@ index 4009fff6361f..bac79efc3909 100644
Library("checks_gn")
diff --git third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-index 758670919dc9..e20bdf1570ff 100644
+index 154848b920fa..09fca9233e44 100644
--- third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
+++ third_party/libwebrtc/rtc_base/compile_assert_c_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -83094,7 +83047,7 @@ index 758670919dc9..e20bdf1570ff 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83204,7 +83157,7 @@ index 758670919dc9..e20bdf1570ff 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83257,11 +83210,11 @@ index 758670919dc9..e20bdf1570ff 100644
-
Library("compile_assert_c_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-index 29e2f794070b..0e1ee33fb9d3 100644
+index d5f7393960b9..0108ed9d35e6 100644
--- third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_containers_internal_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -83281,7 +83234,7 @@ index 29e2f794070b..0e1ee33fb9d3 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83468,11 +83421,11 @@ index 29e2f794070b..0e1ee33fb9d3 100644
Library("flat_containers_internal_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-index 9bdb5b2ad824..55eff7cde666 100644
+index 638358d79d52..c890542ae1f6 100644
--- third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_map_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -83492,7 +83445,7 @@ index 9bdb5b2ad824..55eff7cde666 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83606,7 +83559,7 @@ index 9bdb5b2ad824..55eff7cde666 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83659,11 +83612,11 @@ index 9bdb5b2ad824..55eff7cde666 100644
-
Library("flat_map_gn")
diff --git third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-index 43ac4165fbd2..051e2d72bb5c 100644
+index 92883483f5fd..006cc6bb1523 100644
--- third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
+++ third_party/libwebrtc/rtc_base/containers/flat_set_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -83683,7 +83636,7 @@ index 43ac4165fbd2..051e2d72bb5c 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -83797,7 +83750,7 @@ index 43ac4165fbd2..051e2d72bb5c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -83850,11 +83803,11 @@ index 43ac4165fbd2..051e2d72bb5c 100644
-
Library("flat_set_gn")
diff --git third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-index d35d1ab479c6..f01886085505 100644
+index d46afc84b9ae..2b9429eb7b3a 100644
--- third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/copy_on_write_buffer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -83874,7 +83827,7 @@ index d35d1ab479c6..f01886085505 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84061,11 +84014,11 @@ index d35d1ab479c6..f01886085505 100644
Library("copy_on_write_buffer_gn")
diff --git third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-index 544b3575f3af..1f93cdc117ab 100644
+index d8537d397409..e797c80aed74 100644
--- third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
+++ third_party/libwebrtc/rtc_base/criticalsection_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -84085,7 +84038,7 @@ index 544b3575f3af..1f93cdc117ab 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84272,11 +84225,11 @@ index 544b3575f3af..1f93cdc117ab 100644
Library("criticalsection_gn")
diff --git third_party/libwebrtc/rtc_base/divide_round_gn/moz.build third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-index 013c8ff94548..1156dc035fd3 100644
+index d46350e65b1f..862afa6e80cb 100644
--- third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
+++ third_party/libwebrtc/rtc_base/divide_round_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -84296,7 +84249,7 @@ index 013c8ff94548..1156dc035fd3 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84410,7 +84363,7 @@ index 013c8ff94548..1156dc035fd3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -84463,11 +84416,11 @@ index 013c8ff94548..1156dc035fd3 100644
-
Library("divide_round_gn")
diff --git third_party/libwebrtc/rtc_base/dscp_gn/moz.build third_party/libwebrtc/rtc_base/dscp_gn/moz.build
-index 8e779b7743dd..21675b22576d 100644
+index fd796dcc7283..a69f3be68a5a 100644
--- third_party/libwebrtc/rtc_base/dscp_gn/moz.build
+++ third_party/libwebrtc/rtc_base/dscp_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -84487,7 +84440,7 @@ index 8e779b7743dd..21675b22576d 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84597,7 +84550,7 @@ index 8e779b7743dd..21675b22576d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -84650,11 +84603,11 @@ index 8e779b7743dd..21675b22576d 100644
-
Library("dscp_gn")
diff --git third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-index 411fcbcd72da..cee2e6eedbcc 100644
+index 89739a31462a..caa13bc3d03f 100644
--- third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/event_tracer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -84674,7 +84627,7 @@ index 411fcbcd72da..cee2e6eedbcc 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -84868,11 +84821,11 @@ index 411fcbcd72da..cee2e6eedbcc 100644
Library("event_tracer_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-index 84ed89ed87e1..42435f27ca55 100644
+index db73007e0648..3b48de94a7cf 100644
--- third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/alr_experiment_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -84892,7 +84845,7 @@ index 84ed89ed87e1..42435f27ca55 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85086,11 +85039,11 @@ index 84ed89ed87e1..42435f27ca55 100644
Library("alr_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-index c9d63e7c296f..effe36e6b677 100644
+index a68f41b455b7..1e18365e267f 100644
--- third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/balanced_degradation_settings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -85110,7 +85063,7 @@ index c9d63e7c296f..effe36e6b677 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85304,11 +85257,11 @@ index c9d63e7c296f..effe36e6b677 100644
Library("balanced_degradation_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-index 3fe445b45d51..a50e956523c8 100644
+index 76246fa6ff03..3e75b9cd7207 100644
--- third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/encoder_info_settings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -85328,7 +85281,7 @@ index 3fe445b45d51..a50e956523c8 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85522,11 +85475,11 @@ index 3fe445b45d51..a50e956523c8 100644
Library("encoder_info_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-index 139b64b3d998..1072fbd432a0 100644
+index e55be35e9b1a..7058a6b0e3c6 100644
--- third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/field_trial_parser_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -85546,7 +85499,7 @@ index 139b64b3d998..1072fbd432a0 100644
FINAL_LIBRARY = "xul"
-@@ -46,186 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,186 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85740,11 +85693,11 @@ index 139b64b3d998..1072fbd432a0 100644
Library("field_trial_parser_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-index 08398c40cf56..c1357e5111db 100644
+index e5b723ef37b6..a02341d3de17 100644
--- third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/keyframe_interval_settings_experiment_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -85764,7 +85717,7 @@ index 08398c40cf56..c1357e5111db 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -85958,11 +85911,11 @@ index 08398c40cf56..c1357e5111db 100644
Library("keyframe_interval_settings_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-index d8b7892933f0..bc080f3f2b04 100644
+index e8863d79f0bb..220d29302b62 100644
--- third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/min_video_bitrate_experiment_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -85982,7 +85935,7 @@ index d8b7892933f0..bc080f3f2b04 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86176,11 +86129,11 @@ index d8b7892933f0..bc080f3f2b04 100644
Library("min_video_bitrate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-index 7e7af322ca00..248222fdb89c 100644
+index 50cc28070487..9c8d4710941c 100644
--- third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/normalize_simulcast_size_experiment_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -86200,7 +86153,7 @@ index 7e7af322ca00..248222fdb89c 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86394,11 +86347,11 @@ index 7e7af322ca00..248222fdb89c 100644
Library("normalize_simulcast_size_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-index 2ffaf07d5cea..96c027f57661 100644
+index 7700987d9727..fed428b40312 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaler_settings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -86418,7 +86371,7 @@ index 2ffaf07d5cea..96c027f57661 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86612,11 +86565,11 @@ index 2ffaf07d5cea..96c027f57661 100644
Library("quality_scaler_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-index bc0db9b773f9..f3dc32a385fe 100644
+index cdfadf1b3a44..91fa15309a19 100644
--- third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/quality_scaling_experiment_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -86636,7 +86589,7 @@ index bc0db9b773f9..f3dc32a385fe 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -86830,11 +86783,11 @@ index bc0db9b773f9..f3dc32a385fe 100644
Library("quality_scaling_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-index 6c3dc1ed384f..e704571afe9c 100644
+index d64269a76871..835d78fa3a6c 100644
--- third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/rate_control_settings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -86854,7 +86807,7 @@ index 6c3dc1ed384f..e704571afe9c 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87048,11 +87001,11 @@ index 6c3dc1ed384f..e704571afe9c 100644
Library("rate_control_settings_gn")
diff --git third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-index a96bdf65536e..5a0edcd1347a 100644
+index 708a893a10ad..8620aa9d4bd8 100644
--- third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
+++ third_party/libwebrtc/rtc_base/experiments/stable_target_rate_experiment_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -87072,7 +87025,7 @@ index a96bdf65536e..5a0edcd1347a 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87266,11 +87219,11 @@ index a96bdf65536e..5a0edcd1347a 100644
Library("stable_target_rate_experiment_gn")
diff --git third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-index fd45f36c268e..74059151d385 100644
+index 1a6ff46f9057..286569c90089 100644
--- third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/frequency_tracker_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -87290,7 +87243,7 @@ index fd45f36c268e..74059151d385 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87484,11 +87437,11 @@ index fd45f36c268e..74059151d385 100644
Library("frequency_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-index b4199a311652..d1a4f3caee83 100644
+index 493edecc9a2c..fd41ef0a21f7 100644
--- third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
+++ third_party/libwebrtc/rtc_base/gtest_prod_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -87508,7 +87461,7 @@ index b4199a311652..d1a4f3caee83 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87618,7 +87571,7 @@ index b4199a311652..d1a4f3caee83 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -87671,11 +87624,11 @@ index b4199a311652..d1a4f3caee83 100644
-
Library("gtest_prod_gn")
diff --git third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-index e235da2187aa..7c1c2ed4eca6 100644
+index 51e370a925b2..17a7725eb3c0 100644
--- third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/histogram_percentile_counter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -87695,7 +87648,7 @@ index e235da2187aa..7c1c2ed4eca6 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -87883,10 +87836,10 @@ index e235da2187aa..7c1c2ed4eca6 100644
Library("histogram_percentile_counter_gn")
diff --git third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
deleted file mode 100644
-index bc2ed633f802..000000000000
+index c4e0aad848a9..000000000000
--- third_party/libwebrtc/rtc_base/ifaddrs_android_gn/moz.build
+++ /dev/null
-@@ -1,94 +0,0 @@
+@@ -1,95 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -87902,6 +87855,7 @@ index bc2ed633f802..000000000000
-DEFINES["ANDROID"] = True
-DEFINES["ANDROID_NDK_VERSION_ROLL"] = "r22_1"
-DEFINES["HAVE_SYS_UIO_H"] = True
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ANDROID"] = True
@@ -87982,11 +87936,11 @@ index bc2ed633f802..000000000000
-
-Library("ifaddrs_android_gn")
diff --git third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-index a3761c664470..267e43801deb 100644
+index 01c10d595e8b..0b3ff10cc360 100644
--- third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ignore_wundef_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -88006,7 +87960,7 @@ index a3761c664470..267e43801deb 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88116,7 +88070,7 @@ index a3761c664470..267e43801deb 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -88169,11 +88123,11 @@ index a3761c664470..267e43801deb 100644
-
Library("ignore_wundef_gn")
diff --git third_party/libwebrtc/rtc_base/ip_address_gn/moz.build third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-index 8591a3b9be6c..d5a8d4cae0ef 100644
+index d949fcc26e8d..7d64e4ef330c 100644
--- third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ip_address_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -88193,7 +88147,7 @@ index 8591a3b9be6c..d5a8d4cae0ef 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88387,11 +88341,11 @@ index 8591a3b9be6c..d5a8d4cae0ef 100644
Library("ip_address_gn")
diff --git third_party/libwebrtc/rtc_base/logging_gn/moz.build third_party/libwebrtc/rtc_base/logging_gn/moz.build
-index 0121355ea171..448a2e06255a 100644
+index 2dfe0c2fec46..e391440561dd 100644
--- third_party/libwebrtc/rtc_base/logging_gn/moz.build
+++ third_party/libwebrtc/rtc_base/logging_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -88412,7 +88366,7 @@ index 0121355ea171..448a2e06255a 100644
FINAL_LIBRARY = "xul"
-@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88606,11 +88560,11 @@ index 0121355ea171..448a2e06255a 100644
Library("logging_gn")
diff --git third_party/libwebrtc/rtc_base/macromagic_gn/moz.build third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-index fb0141f9992f..dd3d584195c0 100644
+index 390b189b0db6..4433ee4394b0 100644
--- third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
+++ third_party/libwebrtc/rtc_base/macromagic_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -88630,7 +88584,7 @@ index fb0141f9992f..dd3d584195c0 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -88740,7 +88694,7 @@ index fb0141f9992f..dd3d584195c0 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -88793,11 +88747,11 @@ index fb0141f9992f..dd3d584195c0 100644
-
Library("macromagic_gn")
diff --git third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-index 1965f7ec53af..c2362607b3f3 100644
+index 0a65ef231ef4..4c8711cb2921 100644
--- third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
+++ third_party/libwebrtc/rtc_base/memory/aligned_malloc_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -88817,7 +88771,7 @@ index 1965f7ec53af..c2362607b3f3 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89004,11 +88958,11 @@ index 1965f7ec53af..c2362607b3f3 100644
Library("aligned_malloc_gn")
diff --git third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-index 1b552f64a772..2890fedddb9a 100644
+index 61e454135d16..baf4e8a72632 100644
--- third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
+++ third_party/libwebrtc/rtc_base/mod_ops_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -89028,7 +88982,7 @@ index 1b552f64a772..2890fedddb9a 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89142,7 +89096,7 @@ index 1b552f64a772..2890fedddb9a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -89195,11 +89149,11 @@ index 1b552f64a772..2890fedddb9a 100644
-
Library("mod_ops_gn")
diff --git third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-index c3715c2c6b20..12388acab2b4 100644
+index ec440ef76608..97d948e88c49 100644
--- third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/moving_max_counter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -89219,7 +89173,7 @@ index c3715c2c6b20..12388acab2b4 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89333,7 +89287,7 @@ index c3715c2c6b20..12388acab2b4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -89386,11 +89340,11 @@ index c3715c2c6b20..12388acab2b4 100644
-
Library("moving_max_counter_gn")
diff --git third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-index 33488c655174..ead57cd08a32 100644
+index 68e7540a5cc6..e2763aae13c2 100644
--- third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
+++ third_party/libwebrtc/rtc_base/net_helpers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -89410,7 +89364,7 @@ index 33488c655174..ead57cd08a32 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89604,11 +89558,11 @@ index 33488c655174..ead57cd08a32 100644
Library("net_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
-index 6c4cd224b98b..bc515fc5c103 100644
+index 598652874c2f..b08c4ae86174 100644
--- third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network/ecn_marking_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -89628,7 +89582,7 @@ index 6c4cd224b98b..bc515fc5c103 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89738,7 +89692,7 @@ index 6c4cd224b98b..bc515fc5c103 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -89791,11 +89745,11 @@ index 6c4cd224b98b..bc515fc5c103 100644
-
Library("ecn_marking_gn")
diff --git third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-index 04b51f0502b3..abba0d8decc4 100644
+index c285d04f5def..93432583b4da 100644
--- third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network/sent_packet_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -89815,7 +89769,7 @@ index 04b51f0502b3..abba0d8decc4 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -89998,11 +89952,11 @@ index 04b51f0502b3..abba0d8decc4 100644
Library("sent_packet_gn")
diff --git third_party/libwebrtc/rtc_base/network_constants_gn/moz.build third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-index b8fb244a8e99..a93a94841ac8 100644
+index 3b41f5bba9f9..f95b171fdf32 100644
--- third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_constants_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -90022,7 +89976,7 @@ index b8fb244a8e99..a93a94841ac8 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90209,11 +90163,11 @@ index b8fb244a8e99..a93a94841ac8 100644
Library("network_constants_gn")
diff --git third_party/libwebrtc/rtc_base/network_route_gn/moz.build third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-index 2f552b99a2ba..3a16933c8e3d 100644
+index ed2d7204f43b..5f59b36411dd 100644
--- third_party/libwebrtc/rtc_base/network_route_gn/moz.build
+++ third_party/libwebrtc/rtc_base/network_route_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -90233,7 +90187,7 @@ index 2f552b99a2ba..3a16933c8e3d 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90420,11 +90374,11 @@ index 2f552b99a2ba..3a16933c8e3d 100644
Library("network_route_gn")
diff --git third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-index c07ee42a4768..ca7dd6bb37c7 100644
+index d129b17f1194..cbd1b431f6de 100644
--- third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/null_socket_server_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -90444,7 +90398,7 @@ index c07ee42a4768..ca7dd6bb37c7 100644
FINAL_LIBRARY = "xul"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90639,11 +90593,11 @@ index c07ee42a4768..ca7dd6bb37c7 100644
Library("null_socket_server_gn")
diff --git third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-index 11bbb05fa7c9..9ef0efeb1338 100644
+index 348ef02526a2..74729015b2fb 100644
--- third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/one_time_event_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -90663,7 +90617,7 @@ index 11bbb05fa7c9..9ef0efeb1338 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -90777,7 +90731,7 @@ index 11bbb05fa7c9..9ef0efeb1338 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -90830,11 +90784,11 @@ index 11bbb05fa7c9..9ef0efeb1338 100644
-
Library("one_time_event_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-index 945e2783d6ef..a541e3b4d5a2 100644
+index 9ad40b93add5..07001c7343ac 100644
--- third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -90854,7 +90808,7 @@ index 945e2783d6ef..a541e3b4d5a2 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91048,11 +91002,11 @@ index 945e2783d6ef..a541e3b4d5a2 100644
Library("platform_thread_gn")
diff --git third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-index 48c27d813e17..f23aca8108e2 100644
+index 0d132b2957f2..68d9e334d850 100644
--- third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
+++ third_party/libwebrtc/rtc_base/platform_thread_types_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -91072,7 +91026,7 @@ index 48c27d813e17..f23aca8108e2 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91259,11 +91213,11 @@ index 48c27d813e17..f23aca8108e2 100644
Library("platform_thread_types_gn")
diff --git third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-index 668f1d0a980d..4d3ef5564a90 100644
+index be3e5d165cb6..98b13de31ec0 100644
--- third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/protobuf_utils_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -91283,7 +91237,7 @@ index 668f1d0a980d..4d3ef5564a90 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91393,7 +91347,7 @@ index 668f1d0a980d..4d3ef5564a90 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -91446,11 +91400,11 @@ index 668f1d0a980d..4d3ef5564a90 100644
-
Library("protobuf_utils_gn")
diff --git third_party/libwebrtc/rtc_base/race_checker_gn/moz.build third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-index 6d2ee3c0a0b4..6deeed359a2b 100644
+index 941e32ae1829..dff9cadb77f1 100644
--- third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/race_checker_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -91470,7 +91424,7 @@ index 6d2ee3c0a0b4..6deeed359a2b 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91657,11 +91611,11 @@ index 6d2ee3c0a0b4..6deeed359a2b 100644
Library("race_checker_gn")
diff --git third_party/libwebrtc/rtc_base/random_gn/moz.build third_party/libwebrtc/rtc_base/random_gn/moz.build
-index 38d713e123cd..70cddc604dc3 100644
+index 9a81a9569ef6..e6faef7d99c2 100644
--- third_party/libwebrtc/rtc_base/random_gn/moz.build
+++ third_party/libwebrtc/rtc_base/random_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -91681,7 +91635,7 @@ index 38d713e123cd..70cddc604dc3 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -91868,11 +91822,11 @@ index 38d713e123cd..70cddc604dc3 100644
Library("random_gn")
diff --git third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-index 8827194a0ddc..2ca7defd349f 100644
+index db17875a1c66..7a2df04c78e3 100644
--- third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_limiter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -91892,7 +91846,7 @@ index 8827194a0ddc..2ca7defd349f 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92090,11 +92044,11 @@ index 8827194a0ddc..2ca7defd349f 100644
Library("rate_limiter_gn")
diff --git third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-index 88038145cf15..98328fad3324 100644
+index 6bb56ffbd174..d42bea3f3af5 100644
--- third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_statistics_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -92114,7 +92068,7 @@ index 88038145cf15..98328fad3324 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92308,11 +92262,11 @@ index 88038145cf15..98328fad3324 100644
Library("rate_statistics_gn")
diff --git third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-index bd0629bfa0db..dce869f89476 100644
+index f9532edf05b6..39cdb435615a 100644
--- third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rate_tracker_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -92332,7 +92286,7 @@ index bd0629bfa0db..dce869f89476 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92526,11 +92480,11 @@ index bd0629bfa0db..dce869f89476 100644
Library("rate_tracker_gn")
diff --git third_party/libwebrtc/rtc_base/refcount_gn/moz.build third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-index 3595a7a13a2b..b23b29b3df2a 100644
+index 3de678e52f56..dffea650acbd 100644
--- third_party/libwebrtc/rtc_base/refcount_gn/moz.build
+++ third_party/libwebrtc/rtc_base/refcount_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -92550,7 +92504,7 @@ index 3595a7a13a2b..b23b29b3df2a 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92660,7 +92614,7 @@ index 3595a7a13a2b..b23b29b3df2a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -92713,11 +92667,11 @@ index 3595a7a13a2b..b23b29b3df2a 100644
-
Library("refcount_gn")
diff --git third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
-index daf579df3533..f83bf4191a50 100644
+index 01650e82652c..eb46e9e0940e 100644
--- third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rolling_accumulator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -92737,7 +92691,7 @@ index daf579df3533..f83bf4191a50 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -92851,7 +92805,7 @@ index daf579df3533..f83bf4191a50 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -92904,11 +92858,11 @@ index daf579df3533..f83bf4191a50 100644
-
Library("rolling_accumulator_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-index f01e48e21375..61236b44fa64 100644
+index 57d72e2c1e9f..2a64b57441ec 100644
--- third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_event_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -92928,7 +92882,7 @@ index f01e48e21375..61236b44fa64 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93122,11 +93076,11 @@ index f01e48e21375..61236b44fa64 100644
Library("rtc_event_gn")
diff --git third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-index 9c7b0c6d3f55..a11937d5e09e 100644
+index e5f133fc9924..63aa82161c35 100644
--- third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
+++ third_party/libwebrtc/rtc_base/rtc_numerics_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -93146,7 +93100,7 @@ index 9c7b0c6d3f55..a11937d5e09e 100644
FINAL_LIBRARY = "xul"
-@@ -45,179 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,179 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93333,11 +93287,11 @@ index 9c7b0c6d3f55..a11937d5e09e 100644
Library("rtc_numerics_gn")
diff --git third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-index 80d295aa9d5d..5674190b8fd3 100644
+index a64091f2b704..b5b71363445a 100644
--- third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_compare_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -93357,7 +93311,7 @@ index 80d295aa9d5d..5674190b8fd3 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93467,7 +93421,7 @@ index 80d295aa9d5d..5674190b8fd3 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -93520,11 +93474,11 @@ index 80d295aa9d5d..5674190b8fd3 100644
-
Library("safe_compare_gn")
diff --git third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-index c9b97cb7ed49..614a50cc3677 100644
+index 3041610af6d3..059c8cf3092a 100644
--- third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_conversions_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -93544,7 +93498,7 @@ index c9b97cb7ed49..614a50cc3677 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93658,7 +93612,7 @@ index c9b97cb7ed49..614a50cc3677 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -93711,11 +93665,11 @@ index c9b97cb7ed49..614a50cc3677 100644
-
Library("safe_conversions_gn")
diff --git third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-index 50e6173fccd3..dd120fb85232 100644
+index 58903e9a4e63..2f50afc26237 100644
--- third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
+++ third_party/libwebrtc/rtc_base/safe_minmax_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -93735,7 +93689,7 @@ index 50e6173fccd3..dd120fb85232 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -93849,7 +93803,7 @@ index 50e6173fccd3..dd120fb85232 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -93902,11 +93856,11 @@ index 50e6173fccd3..dd120fb85232 100644
-
Library("safe_minmax_gn")
diff --git third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-index 4ffa48a120cb..5a19758cd0c1 100644
+index 8ee16d80ed85..c9bc739d62e9 100644
--- third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/sample_counter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -93926,7 +93880,7 @@ index 4ffa48a120cb..5a19758cd0c1 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94113,11 +94067,11 @@ index 4ffa48a120cb..5a19758cd0c1 100644
Library("sample_counter_gn")
diff --git third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-index a860a9f7282b..65d7a7b001cc 100644
+index cbd346e5dc21..980b9765b1de 100644
--- third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
+++ third_party/libwebrtc/rtc_base/sanitizer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -94137,7 +94091,7 @@ index a860a9f7282b..65d7a7b001cc 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94247,7 +94201,7 @@ index a860a9f7282b..65d7a7b001cc 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -94300,11 +94254,11 @@ index a860a9f7282b..65d7a7b001cc 100644
-
Library("sanitizer_gn")
diff --git third_party/libwebrtc/rtc_base/socket_address_gn/moz.build third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-index 04cba77cbb9c..b2c6204e306f 100644
+index 7dfe5738c998..91e90e92a460 100644
--- third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_address_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -94324,7 +94278,7 @@ index 04cba77cbb9c..b2c6204e306f 100644
FINAL_LIBRARY = "xul"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94519,11 +94473,11 @@ index 04cba77cbb9c..b2c6204e306f 100644
Library("socket_address_gn")
diff --git third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
-index f3356c04b441..591ac160c8cb 100644
+index 5c4cf0261e1a..4de54ef5649f 100644
--- third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_factory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -94543,7 +94497,7 @@ index f3356c04b441..591ac160c8cb 100644
FINAL_LIBRARY = "xul"
-@@ -39,120 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,120 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94665,7 +94619,7 @@ index f3356c04b441..591ac160c8cb 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -162,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -163,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -94718,11 +94672,11 @@ index f3356c04b441..591ac160c8cb 100644
-
Library("socket_factory_gn")
diff --git third_party/libwebrtc/rtc_base/socket_gn/moz.build third_party/libwebrtc/rtc_base/socket_gn/moz.build
-index edca3916c141..483f18116d82 100644
+index 43f98b9758bf..27b46ae4f612 100644
--- third_party/libwebrtc/rtc_base/socket_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -94742,7 +94696,7 @@ index edca3916c141..483f18116d82 100644
FINAL_LIBRARY = "xul"
-@@ -43,187 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,187 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -94937,11 +94891,11 @@ index edca3916c141..483f18116d82 100644
Library("socket_gn")
diff --git third_party/libwebrtc/rtc_base/socket_server_gn/moz.build third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
-index 942e81926f06..b2c9e653415f 100644
+index d24756b4d615..5a576332fb94 100644
--- third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
+++ third_party/libwebrtc/rtc_base/socket_server_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -94961,7 +94915,7 @@ index 942e81926f06..b2c9e653415f 100644
FINAL_LIBRARY = "xul"
-@@ -39,120 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,120 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95083,7 +95037,7 @@ index 942e81926f06..b2c9e653415f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -162,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -163,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -95136,11 +95090,11 @@ index 942e81926f06..b2c9e653415f 100644
-
Library("socket_server_gn")
diff --git third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
-index 75ac6a6be25d..61f586516d9a 100644
+index 7df6c9be0d52..37f417671c69 100644
--- third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ssl_adapter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -95160,7 +95114,7 @@ index 75ac6a6be25d..61f586516d9a 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95270,7 +95224,7 @@ index 75ac6a6be25d..61f586516d9a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -95323,11 +95277,11 @@ index 75ac6a6be25d..61f586516d9a 100644
-
Library("ssl_adapter_gn")
diff --git third_party/libwebrtc/rtc_base/ssl_gn/moz.build third_party/libwebrtc/rtc_base/ssl_gn/moz.build
-index e3472674ceed..75f5872592d6 100644
+index 3b316011d903..9f73c2a4952a 100644
--- third_party/libwebrtc/rtc_base/ssl_gn/moz.build
+++ third_party/libwebrtc/rtc_base/ssl_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -95347,7 +95301,7 @@ index e3472674ceed..75f5872592d6 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95457,7 +95411,7 @@ index e3472674ceed..75f5872592d6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -95510,11 +95464,11 @@ index e3472674ceed..75f5872592d6 100644
-
Library("ssl_gn")
diff --git third_party/libwebrtc/rtc_base/stringutils_gn/moz.build third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-index 3a9379a6bc47..5c8050faccb3 100644
+index 8968548bc44d..6ae58958a750 100644
--- third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/stringutils_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -95534,7 +95488,7 @@ index 3a9379a6bc47..5c8050faccb3 100644
FINAL_LIBRARY = "xul"
-@@ -47,179 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,179 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95721,11 +95675,11 @@ index 3a9379a6bc47..5c8050faccb3 100644
Library("stringutils_gn")
diff --git third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
-index f095e4d464fa..1d1169bf8b1c 100644
+index 3ca55f387657..3578dca2f457 100644
--- third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
+++ third_party/libwebrtc/rtc_base/strong_alias_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -95745,7 +95699,7 @@ index f095e4d464fa..1d1169bf8b1c 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -95855,7 +95809,7 @@ index f095e4d464fa..1d1169bf8b1c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -95908,11 +95862,11 @@ index f095e4d464fa..1d1169bf8b1c 100644
-
Library("strong_alias_gn")
diff --git third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-index 3fc5f7cf3ddc..f8f4f5f791c7 100644
+index 84aa26f7defe..3b411438cbea 100644
--- third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
+++ third_party/libwebrtc/rtc_base/swap_queue_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -95932,7 +95886,7 @@ index 3fc5f7cf3ddc..f8f4f5f791c7 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96046,7 +96000,7 @@ index 3fc5f7cf3ddc..f8f4f5f791c7 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -96099,11 +96053,11 @@ index 3fc5f7cf3ddc..f8f4f5f791c7 100644
-
Library("swap_queue_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-index ba727290af65..0b02cb2f3fe4 100644
+index 9ce9d8492bdc..97ba7f1f28a4 100644
--- third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/mutex_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -96123,7 +96077,7 @@ index ba727290af65..0b02cb2f3fe4 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96237,7 +96191,7 @@ index ba727290af65..0b02cb2f3fe4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -96290,11 +96244,11 @@ index ba727290af65..0b02cb2f3fe4 100644
-
Library("mutex_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-index 570234e8e2b0..ca17fd6c0ab5 100644
+index 3f32dcb1a7a0..2b47834fa63c 100644
--- third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/sequence_checker_internal_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -96314,7 +96268,7 @@ index 570234e8e2b0..ca17fd6c0ab5 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96501,11 +96455,11 @@ index 570234e8e2b0..ca17fd6c0ab5 100644
Library("sequence_checker_internal_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-index 662dc4ca7ae1..197cc9f03ae6 100644
+index 3e512b9b5730..c09f2aea4cb5 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -96525,7 +96479,7 @@ index 662dc4ca7ae1..197cc9f03ae6 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96708,11 +96662,11 @@ index 662dc4ca7ae1..197cc9f03ae6 100644
Library("yield_gn")
diff --git third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-index 45cb36beecd3..32deffc163e4 100644
+index 3f1dd4f9247c..7269d51420de 100644
--- third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
+++ third_party/libwebrtc/rtc_base/synchronization/yield_policy_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -96732,7 +96686,7 @@ index 45cb36beecd3..32deffc163e4 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -96919,11 +96873,11 @@ index 45cb36beecd3..32deffc163e4 100644
Library("yield_policy_gn")
diff --git third_party/libwebrtc/rtc_base/system/arch_gn/moz.build third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-index c3db5cb3ded8..a2e813fa095d 100644
+index 4deae9759dba..e7eb27834aca 100644
--- third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/arch_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -96943,7 +96897,7 @@ index c3db5cb3ded8..a2e813fa095d 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97053,7 +97007,7 @@ index c3db5cb3ded8..a2e813fa095d 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -97107,10 +97061,10 @@ index c3db5cb3ded8..a2e813fa095d 100644
Library("arch_gn")
diff --git third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
deleted file mode 100644
-index 89f37a5264ae..000000000000
+index 0a5db7e1cf27..000000000000
--- third_party/libwebrtc/rtc_base/system/asm_defines_gn/moz.build
+++ /dev/null
-@@ -1,79 +0,0 @@
+@@ -1,80 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -97123,6 +97077,7 @@ index 89f37a5264ae..000000000000
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ARCH_ARM"] = True
@@ -97192,10 +97147,10 @@ index 89f37a5264ae..000000000000
-Library("asm_defines_gn")
diff --git third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
deleted file mode 100644
-index 558f19324d33..000000000000
+index b151034cb93e..000000000000
--- third_party/libwebrtc/rtc_base/system/cocoa_threading_gn/moz.build
+++ /dev/null
-@@ -1,67 +0,0 @@
+@@ -1,68 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -97212,6 +97167,7 @@ index 558f19324d33..000000000000
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -97264,11 +97220,11 @@ index 558f19324d33..000000000000
-
-Library("cocoa_threading_gn")
diff --git third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-index c5dee909a263..f7eba12a6be4 100644
+index e0f7d039805f..d46c159135e3 100644
--- third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/file_wrapper_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -97288,7 +97244,7 @@ index c5dee909a263..f7eba12a6be4 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97476,10 +97432,10 @@ index c5dee909a263..f7eba12a6be4 100644
Library("file_wrapper_gn")
diff --git third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
deleted file mode 100644
-index ebb3552a5504..000000000000
+index 20d7ec25d78c..000000000000
--- third_party/libwebrtc/rtc_base/system/gcd_helpers_gn/moz.build
+++ /dev/null
-@@ -1,67 +0,0 @@
+@@ -1,68 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -97496,6 +97452,7 @@ index ebb3552a5504..000000000000
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -97548,11 +97505,11 @@ index ebb3552a5504..000000000000
-
-Library("gcd_helpers_gn")
diff --git third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-index 5d57390d5397..b48a3638292c 100644
+index 6f3525b99ada..c14467e95dc7 100644
--- third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/ignore_warnings_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -97572,7 +97529,7 @@ index 5d57390d5397..b48a3638292c 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97682,7 +97639,7 @@ index 5d57390d5397..b48a3638292c 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -97735,11 +97692,11 @@ index 5d57390d5397..b48a3638292c 100644
-
Library("ignore_warnings_gn")
diff --git third_party/libwebrtc/rtc_base/system/inline_gn/moz.build third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-index a7d22c9d0e49..4a835c05d986 100644
+index 2cb5fb8f52a9..1e8684bd302d 100644
--- third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/inline_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -97759,7 +97716,7 @@ index a7d22c9d0e49..4a835c05d986 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -97869,7 +97826,7 @@ index a7d22c9d0e49..4a835c05d986 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -97922,11 +97879,11 @@ index a7d22c9d0e49..4a835c05d986 100644
-
Library("inline_gn")
diff --git third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
-index 790097730f5b..c2c0856a03a4 100644
+index e92150e1d709..da652288e143 100644
--- third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/no_unique_address_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -97946,7 +97903,7 @@ index 790097730f5b..c2c0856a03a4 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98056,7 +98013,7 @@ index 790097730f5b..c2c0856a03a4 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -98109,11 +98066,11 @@ index 790097730f5b..c2c0856a03a4 100644
-
Library("no_unique_address_gn")
diff --git third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-index 5fc704343e06..c60c915ab864 100644
+index 8a7929181db2..8a2c396a6f97 100644
--- third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/rtc_export_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -98133,7 +98090,7 @@ index 5fc704343e06..c60c915ab864 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98243,7 +98200,7 @@ index 5fc704343e06..c60c915ab864 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -98296,11 +98253,11 @@ index 5fc704343e06..c60c915ab864 100644
-
Library("rtc_export_gn")
diff --git third_party/libwebrtc/rtc_base/system/unused_gn/moz.build third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-index f7b9e968bc50..55dff7ae76d6 100644
+index ca4dda9a2e4d..006c6586f890 100644
--- third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/unused_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -98320,7 +98277,7 @@ index f7b9e968bc50..55dff7ae76d6 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98430,7 +98387,7 @@ index f7b9e968bc50..55dff7ae76d6 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -98483,11 +98440,11 @@ index f7b9e968bc50..55dff7ae76d6 100644
-
Library("unused_gn")
diff --git third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-index 5fcc0bfdb857..4a52fef8ab31 100644
+index 39fd02456daa..bf0e8a8cd3f7 100644
--- third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
+++ third_party/libwebrtc/rtc_base/system/warn_current_thread_is_deadlocked_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -98507,7 +98464,7 @@ index 5fcc0bfdb857..4a52fef8ab31 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98617,7 +98574,7 @@ index 5fcc0bfdb857..4a52fef8ab31 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -98670,11 +98627,11 @@ index 5fcc0bfdb857..4a52fef8ab31 100644
-
Library("warn_current_thread_is_deadlocked_gn")
diff --git third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-index 7cf1e2075a0f..e4e1313c11ac 100644
+index 087b4c4d88d2..e8429bb53f50 100644
--- third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
+++ third_party/libwebrtc/rtc_base/task_utils/repeating_task_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -98694,7 +98651,7 @@ index 7cf1e2075a0f..e4e1313c11ac 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -98892,11 +98849,11 @@ index 7cf1e2075a0f..e4e1313c11ac 100644
Library("repeating_task_gn")
diff --git third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-index 6450a0f93d9c..17a7e7e1fd02 100644
+index ae1efc51c7bd..6ef27d676626 100644
--- third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
+++ third_party/libwebrtc/rtc_base/third_party/base64/base64_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -98916,7 +98873,7 @@ index 6450a0f93d9c..17a7e7e1fd02 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99103,11 +99060,11 @@ index 6450a0f93d9c..17a7e7e1fd02 100644
Library("base64_gn")
diff --git third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-index c49d14388071..0ffbd2fcb7c5 100644
+index d5acb89419a4..7c934ab8aa45 100644
--- third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
+++ third_party/libwebrtc/rtc_base/third_party/sigslot/sigslot_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -99127,7 +99084,7 @@ index c49d14388071..0ffbd2fcb7c5 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99310,11 +99267,11 @@ index c49d14388071..0ffbd2fcb7c5 100644
Library("sigslot_gn")
diff --git third_party/libwebrtc/rtc_base/threading_gn/moz.build third_party/libwebrtc/rtc_base/threading_gn/moz.build
-index e7736326f899..f9660eb3f4bf 100644
+index 25c10fd9be18..4bbc22347358 100644
--- third_party/libwebrtc/rtc_base/threading_gn/moz.build
+++ third_party/libwebrtc/rtc_base/threading_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -99334,7 +99291,7 @@ index e7736326f899..f9660eb3f4bf 100644
FINAL_LIBRARY = "xul"
-@@ -46,203 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -47,203 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99545,11 +99502,11 @@ index e7736326f899..f9660eb3f4bf 100644
Library("threading_gn")
diff --git third_party/libwebrtc/rtc_base/timeutils_gn/moz.build third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-index d0e0c964838e..b0b2d2ee8d11 100644
+index 4a4eb9a5299d..c44c88674e94 100644
--- third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
+++ third_party/libwebrtc/rtc_base/timeutils_gn/moz.build
-@@ -12,12 +12,21 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,12 +13,21 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -99570,7 +99527,7 @@ index d0e0c964838e..b0b2d2ee8d11 100644
FINAL_LIBRARY = "xul"
-@@ -45,186 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -46,186 +55,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99764,11 +99721,11 @@ index d0e0c964838e..b0b2d2ee8d11 100644
Library("timeutils_gn")
diff --git third_party/libwebrtc/rtc_base/type_traits_gn/moz.build third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-index 53e285beefd0..3eaba3fb643a 100644
+index f2f4e6b6ca45..ae4a3a9be6cc 100644
--- third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
+++ third_party/libwebrtc/rtc_base/type_traits_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -99788,7 +99745,7 @@ index 53e285beefd0..3eaba3fb643a 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -99898,7 +99855,7 @@ index 53e285beefd0..3eaba3fb643a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -99951,11 +99908,11 @@ index 53e285beefd0..3eaba3fb643a 100644
-
Library("type_traits_gn")
diff --git third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
-index 20c6f058f674..8adce8dc7f84 100644
+index e1cd710315ee..7fdf646e5b07 100644
--- third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
+++ third_party/libwebrtc/rtc_base/unique_id_generator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -99975,7 +99932,7 @@ index 20c6f058f674..8adce8dc7f84 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100085,7 +100042,7 @@ index 20c6f058f674..8adce8dc7f84 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -100138,11 +100095,11 @@ index 20c6f058f674..8adce8dc7f84 100644
-
Library("unique_id_generator_gn")
diff --git third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-index 8a5700f89120..694cd6886a8f 100644
+index cd430975e933..5415e6422549 100644
--- third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
+++ third_party/libwebrtc/rtc_base/units/unit_base_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -100162,7 +100119,7 @@ index 8a5700f89120..694cd6886a8f 100644
FINAL_LIBRARY = "xul"
-@@ -39,112 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,112 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100276,7 +100233,7 @@ index 8a5700f89120..694cd6886a8f 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -154,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -155,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -100329,11 +100286,11 @@ index 8a5700f89120..694cd6886a8f 100644
-
Library("unit_base_gn")
diff --git third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-index 037497b88501..44308d06766c 100644
+index abd3030f27e3..d0ec863efabb 100644
--- third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
+++ third_party/libwebrtc/rtc_base/weak_ptr_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -100353,7 +100310,7 @@ index 037497b88501..44308d06766c 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -100541,10 +100498,10 @@ index 037497b88501..44308d06766c 100644
Library("weak_ptr_gn")
diff --git third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
deleted file mode 100644
-index 6782a6918724..000000000000
+index 93df4e562812..000000000000
--- third_party/libwebrtc/rtc_base/win/create_direct3d_device_gn/moz.build
+++ /dev/null
-@@ -1,85 +0,0 @@
+@@ -1,86 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100560,6 +100517,7 @@ index 6782a6918724..000000000000
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
@@ -100632,10 +100590,10 @@ index 6782a6918724..000000000000
-Library("create_direct3d_device_gn")
diff --git third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
deleted file mode 100644
-index f2ad41ae9f27..000000000000
+index 8fa6b23b483a..000000000000
--- third_party/libwebrtc/rtc_base/win/get_activation_factory_gn/moz.build
+++ /dev/null
-@@ -1,85 +0,0 @@
+@@ -1,86 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100651,6 +100609,7 @@ index f2ad41ae9f27..000000000000
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
@@ -100723,10 +100682,10 @@ index f2ad41ae9f27..000000000000
-Library("get_activation_factory_gn")
diff --git third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
deleted file mode 100644
-index ba15ff2b3c18..000000000000
+index 5578d95daeba..000000000000
--- third_party/libwebrtc/rtc_base/win/hstring_gn/moz.build
+++ /dev/null
-@@ -1,85 +0,0 @@
+@@ -1,86 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100742,6 +100701,7 @@ index ba15ff2b3c18..000000000000
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
@@ -100814,10 +100774,10 @@ index ba15ff2b3c18..000000000000
-Library("hstring_gn")
diff --git third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
deleted file mode 100644
-index 8720108cc441..000000000000
+index 8875633ae5e1..000000000000
--- third_party/libwebrtc/rtc_base/win/windows_version_gn/moz.build
+++ /dev/null
-@@ -1,85 +0,0 @@
+@@ -1,86 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100833,6 +100793,7 @@ index 8720108cc441..000000000000
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
@@ -100905,10 +100866,10 @@ index 8720108cc441..000000000000
-Library("windows_version_gn")
diff --git third_party/libwebrtc/rtc_base/win32_gn/moz.build third_party/libwebrtc/rtc_base/win32_gn/moz.build
deleted file mode 100644
-index 0c72f4850db5..000000000000
+index cbdb0a0a3d14..000000000000
--- third_party/libwebrtc/rtc_base/win32_gn/moz.build
+++ /dev/null
-@@ -1,92 +0,0 @@
+@@ -1,93 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -100924,6 +100885,7 @@ index 0c72f4850db5..000000000000
-DEFINES["CERT_CHAIN_PARA_HAS_EXTRA_FIELDS"] = True
-DEFINES["NOMINMAX"] = True
-DEFINES["NTDDI_VERSION"] = "0x0A000000"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["PSAPI_VERSION"] = "2"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
@@ -101002,11 +100964,11 @@ index 0c72f4850db5..000000000000
-
-Library("win32_gn")
diff --git third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-index 6571d6610000..8364eaec6364 100644
+index 7c022b4d3b00..c5aebb895490 100644
--- third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
+++ third_party/libwebrtc/rtc_base/zero_memory_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -101026,7 +100988,7 @@ index 6571d6610000..8364eaec6364 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101214,10 +101176,10 @@ index 6571d6610000..8364eaec6364 100644
Library("zero_memory_gn")
diff --git third_party/libwebrtc/sdk/base_objc_gn/moz.build third_party/libwebrtc/sdk/base_objc_gn/moz.build
deleted file mode 100644
-index aa939b4394b7..000000000000
+index b717f3d73aea..000000000000
--- third_party/libwebrtc/sdk/base_objc_gn/moz.build
+++ /dev/null
-@@ -1,80 +0,0 @@
+@@ -1,81 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -101238,6 +101200,7 @@ index aa939b4394b7..000000000000
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -101300,10 +101263,10 @@ index aa939b4394b7..000000000000
-Library("base_objc_gn")
diff --git third_party/libwebrtc/sdk/helpers_objc_gn/moz.build third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
deleted file mode 100644
-index 161ce60f39a6..000000000000
+index 50505e56c2d0..000000000000
--- third_party/libwebrtc/sdk/helpers_objc_gn/moz.build
+++ /dev/null
-@@ -1,75 +0,0 @@
+@@ -1,76 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -101324,6 +101287,7 @@ index 161ce60f39a6..000000000000
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -101381,10 +101345,10 @@ index 161ce60f39a6..000000000000
-Library("helpers_objc_gn")
diff --git third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
deleted file mode 100644
-index db4fdfb6b108..000000000000
+index 178d8f87063a..000000000000
--- third_party/libwebrtc/sdk/videocapture_objc_gn/moz.build
+++ /dev/null
-@@ -1,70 +0,0 @@
+@@ -1,71 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -101401,6 +101365,7 @@ index db4fdfb6b108..000000000000
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -101457,10 +101422,10 @@ index db4fdfb6b108..000000000000
-Library("videocapture_objc_gn")
diff --git third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
deleted file mode 100644
-index f705e220de43..000000000000
+index 8c659d55bf23..000000000000
--- third_party/libwebrtc/sdk/videoframebuffer_objc_gn/moz.build
+++ /dev/null
-@@ -1,73 +0,0 @@
+@@ -1,74 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@@ -101477,6 +101442,7 @@ index f705e220de43..000000000000
-AllowCompilerWarnings()
-
-DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+-DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
-DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
-DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
@@ -101535,11 +101501,11 @@ index f705e220de43..000000000000
-
-Library("videoframebuffer_objc_gn")
diff --git third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
-index 12ee5d255fe2..6bd1fd6680b8 100644
+index 8e69f1bd487a..10ca6bd2865c 100644
--- third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/denormal_disabler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -101559,7 +101525,7 @@ index 12ee5d255fe2..6bd1fd6680b8 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101746,11 +101712,11 @@ index 12ee5d255fe2..6bd1fd6680b8 100644
Library("denormal_disabler_gn")
diff --git third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-index 2c548ba00fb6..a701c73887a2 100644
+index 2c1b80184520..2982fabad79a 100644
--- third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/field_trial_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -101770,7 +101736,7 @@ index 2c548ba00fb6..a701c73887a2 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -101964,11 +101930,11 @@ index 2c548ba00fb6..a701c73887a2 100644
Library("field_trial_gn")
diff --git third_party/libwebrtc/system_wrappers/metrics_gn/moz.build third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-index 57f648c68c3e..e2880acbca11 100644
+index 77e78153ea35..ad2149b736c2 100644
--- third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/metrics_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -101988,7 +101954,7 @@ index 57f648c68c3e..e2880acbca11 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102175,11 +102141,11 @@ index 57f648c68c3e..e2880acbca11 100644
Library("metrics_gn")
diff --git third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-index 315dc3c5a19f..ed99cf26c467 100644
+index 639e627348c4..e0895664e27d 100644
--- third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
+++ third_party/libwebrtc/system_wrappers/system_wrappers_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -102199,7 +102165,7 @@ index 315dc3c5a19f..ed99cf26c467 100644
FINAL_LIBRARY = "xul"
-@@ -47,200 +56,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -48,200 +57,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102407,11 +102373,11 @@ index 315dc3c5a19f..ed99cf26c467 100644
Library("system_wrappers_gn")
diff --git third_party/libwebrtc/test/network/simulated_network_gn/moz.build third_party/libwebrtc/test/network/simulated_network_gn/moz.build
-index eef00c758907..40a957d79e39 100644
+index 32db92831a8b..b2fd5c533459 100644
--- third_party/libwebrtc/test/network/simulated_network_gn/moz.build
+++ third_party/libwebrtc/test/network/simulated_network_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -102431,7 +102397,7 @@ index eef00c758907..40a957d79e39 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102618,11 +102584,11 @@ index eef00c758907..40a957d79e39 100644
Library("simulated_network_gn")
diff --git third_party/libwebrtc/test/rtp_test_utils_gn/moz.build third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-index 8ba53a95692c..647a18cc18ac 100644
+index 2d610fe2fe88..e290a713c076 100644
--- third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
+++ third_party/libwebrtc/test/rtp_test_utils_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -102642,7 +102608,7 @@ index 8ba53a95692c..647a18cc18ac 100644
FINAL_LIBRARY = "xul"
-@@ -39,124 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,124 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -102768,7 +102734,7 @@ index 8ba53a95692c..647a18cc18ac 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -166,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -167,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -103572,11 +103538,11 @@ index d06b3dade25e..4208f752cbc2 100644
Library("crc32c_sse42_gn")
diff --git third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
-index 3773aea3b30c..05dfadacfca8 100644
+index 1bfed617a6fe..806fe6e74dc3 100644
--- third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
+++ third_party/libwebrtc/third_party/dav1d/dav1d_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -103596,7 +103562,7 @@ index 3773aea3b30c..05dfadacfca8 100644
FINAL_LIBRARY = "xul"
-@@ -41,108 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,108 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103706,7 +103672,7 @@ index 3773aea3b30c..05dfadacfca8 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -152,50 +70,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +71,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -103758,108 +103724,12 @@ index 3773aea3b30c..05dfadacfca8 100644
- DEFINES["_GNU_SOURCE"] = True
-
Library("dav1d_gn")
-diff --git third_party/libwebrtc/third_party/drm/drm_gn/moz.build third_party/libwebrtc/third_party/drm/drm_gn/moz.build
-index 06bad5c1495d..b43a1368f34e 100644
---- third_party/libwebrtc/third_party/drm/drm_gn/moz.build
-+++ third_party/libwebrtc/third_party/drm/drm_gn/moz.build
-@@ -12,20 +12,16 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
--DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
--DEFINES["USE_NSS_CERTS"] = "1"
- DEFINES["USE_OZONE"] = "1"
--DEFINES["USE_UDEV"] = True
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
--DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
- DEFINES["_FILE_OFFSET_BITS"] = "64"
--DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
-@@ -62,12 +58,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
-
- DEFINES["MIPS32_LE"] = True
-@@ -81,7 +71,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
- DEFINES["USE_X11"] = "1"
-
-diff --git third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build
-index 5334af6f6d3e..8ac69036fd19 100644
---- third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build
-+++ third_party/libwebrtc/third_party/gbm/gbm_gn/moz.build
-@@ -12,20 +12,16 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
--DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
--DEFINES["USE_NSS_CERTS"] = "1"
- DEFINES["USE_OZONE"] = "1"
--DEFINES["USE_UDEV"] = True
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
--DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
- DEFINES["_FILE_OFFSET_BITS"] = "64"
--DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
-@@ -60,12 +56,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
-
- DEFINES["MIPS32_LE"] = True
-@@ -79,7 +69,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
- DEFINES["USE_X11"] = "1"
-
diff --git third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
-index 8a8fc71f17af..93fd56af47e5 100644
+index 829835d9d69d..f861dd357a02 100644
--- third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
+++ third_party/libwebrtc/third_party/libaom/libaom_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -103879,7 +103749,7 @@ index 8a8fc71f17af..93fd56af47e5 100644
FINAL_LIBRARY = "xul"
-@@ -39,108 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,108 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -103989,7 +103859,7 @@ index 8a8fc71f17af..93fd56af47e5 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -150,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -151,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -104042,11 +103912,11 @@ index 8a8fc71f17af..93fd56af47e5 100644
-
Library("aom_gn")
diff --git third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-index 22ab191e5227..a27cb940a7c6 100644
+index 7d1347ef2c7f..2cd44f6fb564 100644
--- third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
+++ third_party/libwebrtc/third_party/libepoxy/libepoxy_gn/moz.build
-@@ -12,20 +12,16 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,20 +13,16 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
-DEFINES["USE_AURA"] = "1"
@@ -104067,7 +103937,7 @@ index 22ab191e5227..a27cb940a7c6 100644
DEFINES["_LARGEFILE64_SOURCE"] = True
DEFINES["_LARGEFILE_SOURCE"] = True
DEFINES["__STDC_CONSTANT_MACROS"] = True
-@@ -61,12 +57,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
+@@ -62,12 +58,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
@@ -104080,7 +103950,7 @@ index 22ab191e5227..a27cb940a7c6 100644
if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
-@@ -80,7 +70,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -81,7 +71,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -104090,11 +103960,11 @@ index 22ab191e5227..a27cb940a7c6 100644
DEFINES["USE_X11"] = "1"
diff --git third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-index 4a72444177d6..0536f67f8865 100644
+index 9f0e46f16702..6545a40c6ef1 100644
--- third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
+++ third_party/libwebrtc/third_party/libyuv/libyuv_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -104114,7 +103984,7 @@ index 4a72444177d6..0536f67f8865 100644
FINAL_LIBRARY = "xul"
-@@ -41,108 +50,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -42,108 +51,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -104224,7 +104094,7 @@ index 4a72444177d6..0536f67f8865 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -152,50 +70,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -153,50 +71,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -104453,55 +104323,6 @@ index dc7c06ffc21f..1617e9c2e1bb 100644
+ DEFINES["USE_X11"] = "1"
Library("pffft_gn")
-diff --git third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
-index 7ee6d71247e1..e5048d9d598c 100644
---- third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
-+++ third_party/libwebrtc/third_party/pipewire/pipewire_gn/moz.build
-@@ -12,21 +12,17 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
- DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
- DEFINES["RTC_ENABLE_VP9"] = True
--DEFINES["USE_AURA"] = "1"
- DEFINES["USE_GLIB"] = "1"
--DEFINES["USE_NSS_CERTS"] = "1"
- DEFINES["USE_OZONE"] = "1"
--DEFINES["USE_UDEV"] = True
-+DEFINES["WEBRTC_BSD"] = True
- DEFINES["WEBRTC_ENABLE_PROTOBUF"] = "0"
- DEFINES["WEBRTC_LIBRARY_IMPL"] = True
--DEFINES["WEBRTC_LINUX"] = True
- DEFINES["WEBRTC_MOZILLA_BUILD"] = True
- DEFINES["WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS"] = "0"
- DEFINES["WEBRTC_POSIX"] = True
- DEFINES["WEBRTC_STRICT_FIELD_TRIALS"] = "0"
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_FILE_OFFSET_BITS"] = "64"
--DEFINES["_GNU_SOURCE"] = True
- DEFINES["_LARGEFILE64_SOURCE"] = True
- DEFINES["_LARGEFILE_SOURCE"] = True
- DEFINES["__STDC_CONSTANT_MACROS"] = True
-@@ -61,12 +57,6 @@ if CONFIG["TARGET_CPU"] == "aarch64":
- DEFINES["WEBRTC_ARCH_ARM64"] = True
- DEFINES["WEBRTC_HAS_NEON"] = True
-
--if CONFIG["TARGET_CPU"] == "arm":
--
-- DEFINES["WEBRTC_ARCH_ARM"] = True
-- DEFINES["WEBRTC_ARCH_ARM_V7"] = True
-- DEFINES["WEBRTC_HAS_NEON"] = True
--
- if CONFIG["TARGET_CPU"] == "mips32":
-
- DEFINES["MIPS32_LE"] = True
-@@ -80,7 +70,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
-
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-
--if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
-+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
-
- DEFINES["USE_X11"] = "1"
-
diff --git third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
index 2dfd79a68cf7..3703f7ef3366 100644
--- third_party/libwebrtc/third_party/rnnoise/rnn_vad_gn/moz.build
@@ -104669,11 +104490,11 @@ index 2dfd79a68cf7..3703f7ef3366 100644
Library("rnn_vad_gn")
diff --git third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-index 07c16154f97d..393215e34c1e 100644
+index 2c62e9cbe092..d82fa66a2945 100644
--- third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
+++ third_party/libwebrtc/video/adaptation/video_adaptation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -104693,7 +104514,7 @@ index 07c16154f97d..393215e34c1e 100644
FINAL_LIBRARY = "xul"
-@@ -51,191 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,191 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -104892,11 +104713,11 @@ index 07c16154f97d..393215e34c1e 100644
Library("video_adaptation_gn")
diff --git third_party/libwebrtc/video/config/encoder_config_gn/moz.build third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-index b48b001014bc..eebc89a69ef7 100644
+index 8f1b9bb33967..a7be3784a0df 100644
--- third_party/libwebrtc/video/config/encoder_config_gn/moz.build
+++ third_party/libwebrtc/video/config/encoder_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -104916,7 +104737,7 @@ index b48b001014bc..eebc89a69ef7 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105110,11 +104931,11 @@ index b48b001014bc..eebc89a69ef7 100644
Library("encoder_config_gn")
diff --git third_party/libwebrtc/video/config/streams_config_gn/moz.build third_party/libwebrtc/video/config/streams_config_gn/moz.build
-index b3f38848dde8..02e9a43bc366 100644
+index f8965ab6f5df..7981a149e1f0 100644
--- third_party/libwebrtc/video/config/streams_config_gn/moz.build
+++ third_party/libwebrtc/video/config/streams_config_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -105134,7 +104955,7 @@ index b3f38848dde8..02e9a43bc366 100644
FINAL_LIBRARY = "xul"
-@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -45,191 +54,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105333,11 +105154,11 @@ index b3f38848dde8..02e9a43bc366 100644
Library("streams_config_gn")
diff --git third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-index 6aeed8259081..670e89595328 100644
+index 0e4f9c57e0ae..d6e888a454a7 100644
--- third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/corruption_classifier_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -105357,7 +105178,7 @@ index 6aeed8259081..670e89595328 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105551,11 +105372,11 @@ index 6aeed8259081..670e89595328 100644
Library("corruption_classifier_gn")
diff --git third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-index 9e7ad18b2421..a79ced32f2f1 100644
+index 5f3217f3222e..610cdfe12383 100644
--- third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/frame_instrumentation_evaluation_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -105575,7 +105396,7 @@ index 9e7ad18b2421..a79ced32f2f1 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105769,11 +105590,11 @@ index 9e7ad18b2421..a79ced32f2f1 100644
Library("frame_instrumentation_evaluation_gn")
diff --git third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-index 5a1b79701b0b..0cfa6950a537 100644
+index 9d03622daa05..81d9185c0a7d 100644
--- third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/frame_instrumentation_generator_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -105793,7 +105614,7 @@ index 5a1b79701b0b..0cfa6950a537 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -105992,11 +105813,11 @@ index 5a1b79701b0b..0cfa6950a537 100644
Library("frame_instrumentation_generator_gn")
diff --git third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
-index 0e7ce07afba2..2a396481ef05 100644
+index 37551c088b6f..166e00c8e94b 100644
--- third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/generic_mapping_functions_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -106016,7 +105837,7 @@ index 0e7ce07afba2..2a396481ef05 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106210,11 +106031,11 @@ index 0e7ce07afba2..2a396481ef05 100644
Library("generic_mapping_functions_gn")
diff --git third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
-index 99c1fae3146f..6a61f9a394da 100644
+index d1ea963e5731..336c6e382e2f 100644
--- third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/halton_frame_sampler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -106234,7 +106055,7 @@ index 99c1fae3146f..6a61f9a394da 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106428,11 +106249,11 @@ index 99c1fae3146f..6a61f9a394da 100644
Library("halton_frame_sampler_gn")
diff --git third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
-index ffcf6099f6c0..968541539a49 100644
+index 2ca4023e96ed..ef1e0a772a9a 100644
--- third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
+++ third_party/libwebrtc/video/corruption_detection/halton_sequence_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -106452,7 +106273,7 @@ index ffcf6099f6c0..968541539a49 100644
FINAL_LIBRARY = "xul"
-@@ -43,179 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,179 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106639,11 +106460,11 @@ index ffcf6099f6c0..968541539a49 100644
Library("halton_sequence_gn")
diff --git third_party/libwebrtc/video/decode_synchronizer_gn/moz.build third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-index d41c0c6b2925..014608d80234 100644
+index 27a93ff88bdf..4cb2ebd4a0ea 100644
--- third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
+++ third_party/libwebrtc/video/decode_synchronizer_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -106663,7 +106484,7 @@ index d41c0c6b2925..014608d80234 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -106861,11 +106682,11 @@ index d41c0c6b2925..014608d80234 100644
Library("decode_synchronizer_gn")
diff --git third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-index 5b2a99954cc4..7ed9a69b2f88 100644
+index 6833cde2b29a..94ba7405ba0e 100644
--- third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
+++ third_party/libwebrtc/video/frame_cadence_adapter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -106885,7 +106706,7 @@ index 5b2a99954cc4..7ed9a69b2f88 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107083,11 +106904,11 @@ index 5b2a99954cc4..7ed9a69b2f88 100644
Library("frame_cadence_adapter_gn")
diff --git third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
-index 6859cfa6b9d4..b07b1298bb9a 100644
+index 492e8396d7f1..35c08dd6c9da 100644
--- third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
+++ third_party/libwebrtc/video/frame_decode_scheduler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -107107,7 +106928,7 @@ index 6859cfa6b9d4..b07b1298bb9a 100644
FINAL_LIBRARY = "xul"
-@@ -39,123 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,123 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107232,7 +107053,7 @@ index 6859cfa6b9d4..b07b1298bb9a 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -165,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -166,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -107285,11 +107106,11 @@ index 6859cfa6b9d4..b07b1298bb9a 100644
-
Library("frame_decode_scheduler_gn")
diff --git third_party/libwebrtc/video/frame_decode_timing_gn/moz.build third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-index 8ef09f2eec94..c60e05070dc5 100644
+index 58a909e8d4b0..f7d64ab60379 100644
--- third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
+++ third_party/libwebrtc/video/frame_decode_timing_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -107309,7 +107130,7 @@ index 8ef09f2eec94..c60e05070dc5 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107507,11 +107328,11 @@ index 8ef09f2eec94..c60e05070dc5 100644
Library("frame_decode_timing_gn")
diff --git third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-index f76bfc61db99..66b7669f9d5f 100644
+index 2b688c034655..566b0c806c68 100644
--- third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
+++ third_party/libwebrtc/video/frame_dumping_decoder_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -107531,7 +107352,7 @@ index f76bfc61db99..66b7669f9d5f 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107730,11 +107551,11 @@ index f76bfc61db99..66b7669f9d5f 100644
Library("frame_dumping_decoder_gn")
diff --git third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-index c4bad706172c..18ffb380392c 100644
+index 7205ea8c1cf3..dd0edb14e927 100644
--- third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
+++ third_party/libwebrtc/video/frame_dumping_encoder_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -107754,7 +107575,7 @@ index c4bad706172c..18ffb380392c 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -107953,11 +107774,11 @@ index c4bad706172c..18ffb380392c 100644
Library("frame_dumping_encoder_gn")
diff --git third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-index 092bbc95e288..f1c6ded0f367 100644
+index 4b7bf065fbf1..450ec1241bb6 100644
--- third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
+++ third_party/libwebrtc/video/render/incoming_video_stream_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -107977,7 +107798,7 @@ index 092bbc95e288..f1c6ded0f367 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -108171,11 +107992,11 @@ index 092bbc95e288..f1c6ded0f367 100644
Library("incoming_video_stream_gn")
diff --git third_party/libwebrtc/video/render/video_render_frames_gn/moz.build third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-index 39558b4b3e5b..c1df4e9bd177 100644
+index 40c2cc0ee11c..afc161293679 100644
--- third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
+++ third_party/libwebrtc/video/render/video_render_frames_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -108195,7 +108016,7 @@ index 39558b4b3e5b..c1df4e9bd177 100644
FINAL_LIBRARY = "xul"
-@@ -43,186 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,186 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -108389,11 +108210,11 @@ index 39558b4b3e5b..c1df4e9bd177 100644
Library("video_render_frames_gn")
diff --git third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
-index f4f66565f437..7dc1d04b59ba 100644
+index f48a99ae30f0..278644a5eed5 100644
--- third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
+++ third_party/libwebrtc/video/task_queue_frame_decode_scheduler_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -108413,7 +108234,7 @@ index f4f66565f437..7dc1d04b59ba 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -108611,11 +108432,11 @@ index f4f66565f437..7dc1d04b59ba 100644
Library("task_queue_frame_decode_scheduler_gn")
diff --git third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-index 29ff4759b500..95d109725a60 100644
+index 44c3fed1208b..feacfc5d5716 100644
--- third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
+++ third_party/libwebrtc/video/unique_timestamp_counter_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -108635,7 +108456,7 @@ index 29ff4759b500..95d109725a60 100644
FINAL_LIBRARY = "xul"
-@@ -43,175 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,175 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -108818,11 +108639,11 @@ index 29ff4759b500..95d109725a60 100644
Library("unique_timestamp_counter_gn")
diff --git third_party/libwebrtc/video/video_gn/moz.build third_party/libwebrtc/video/video_gn/moz.build
-index edf7a88ed789..bb85d9269feb 100644
+index 86ce29262eb6..db6309640745 100644
--- third_party/libwebrtc/video/video_gn/moz.build
+++ third_party/libwebrtc/video/video_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -108842,7 +108663,7 @@ index edf7a88ed789..bb85d9269feb 100644
FINAL_LIBRARY = "xul"
-@@ -62,191 +71,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -63,191 +72,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -109041,11 +108862,11 @@ index edf7a88ed789..bb85d9269feb 100644
Library("video_gn")
diff --git third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
-index d530ed77f21f..239678e8ec81 100644
+index 12d0513ca083..a938e5cb2bf2 100644
--- third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
+++ third_party/libwebrtc/video/video_receive_stream_timeout_tracker_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -109065,7 +108886,7 @@ index d530ed77f21f..239678e8ec81 100644
FINAL_LIBRARY = "xul"
-@@ -43,190 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,190 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -109263,11 +109084,11 @@ index d530ed77f21f..239678e8ec81 100644
Library("video_receive_stream_timeout_tracker_gn")
diff --git third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-index c53b093328e9..e2abf01eacce 100644
+index a197def242bb..84863d3a8c02 100644
--- third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_buffer_controller_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -109287,7 +109108,7 @@ index c53b093328e9..e2abf01eacce 100644
FINAL_LIBRARY = "xul"
-@@ -43,191 +52,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -44,191 +53,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -109486,11 +109307,11 @@ index c53b093328e9..e2abf01eacce 100644
Library("video_stream_buffer_controller_gn")
diff --git third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-index f971adeadf17..e988fef7d80f 100644
+index 6ea5c303a15d..c678f28a8343 100644
--- third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_encoder_impl_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -109510,7 +109331,7 @@ index f971adeadf17..e988fef7d80f 100644
FINAL_LIBRARY = "xul"
-@@ -51,191 +60,32 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -52,191 +61,32 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -109709,11 +109530,11 @@ index f971adeadf17..e988fef7d80f 100644
Library("video_stream_encoder_impl_gn")
diff --git third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
-index 5d1297f9aa4e..30518fdfa2be 100644
+index b270923b1375..89c31ebae9ee 100644
--- third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
+++ third_party/libwebrtc/video/video_stream_encoder_interface_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -109733,7 +109554,7 @@ index 5d1297f9aa4e..30518fdfa2be 100644
FINAL_LIBRARY = "xul"
-@@ -39,119 +48,17 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,119 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -109854,7 +109675,7 @@ index 5d1297f9aa4e..30518fdfa2be 100644
if CONFIG["TARGET_CPU"] == "x86":
-@@ -161,50 +68,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -162,50 +69,8 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
@@ -109907,11 +109728,11 @@ index 5d1297f9aa4e..30518fdfa2be 100644
-
Library("video_stream_encoder_interface_gn")
diff --git third_party/libwebrtc/webrtc_gn/moz.build third_party/libwebrtc/webrtc_gn/moz.build
-index affa5998b64e..0fbfe6858f2a 100644
+index 0bf8e11b5430..e393c24e9a7b 100644
--- third_party/libwebrtc/webrtc_gn/moz.build
+++ third_party/libwebrtc/webrtc_gn/moz.build
-@@ -12,11 +12,20 @@ AllowCompilerWarnings()
- DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+@@ -13,11 +13,20 @@ DEFINES["ABSL_ALLOCATOR_NOTHROW"] = "1"
+ DEFINES["PROTOBUF_ENABLE_DEBUG_LOGGING_MAY_LEAK_PII"] = "0"
DEFINES["RTC_DAV1D_IN_INTERNAL_DECODER_FACTORY"] = True
DEFINES["RTC_ENABLE_VP9"] = True
+DEFINES["USE_GLIB"] = "1"
@@ -109931,7 +109752,7 @@ index affa5998b64e..0fbfe6858f2a 100644
FINAL_LIBRARY = "xul"
-@@ -39,144 +48,23 @@ if not CONFIG["MOZ_DEBUG"]:
+@@ -40,147 +49,17 @@ if not CONFIG["MOZ_DEBUG"]:
if CONFIG["MOZ_DEBUG"] == "1":
DEFINES["DYNAMIC_ANNOTATIONS_ENABLED"] = "1"
@@ -110057,7 +109878,6 @@ index affa5998b64e..0fbfe6858f2a 100644
DEFINES["WEBRTC_ARCH_ARM64"] = True
DEFINES["WEBRTC_HAS_NEON"] = True
-+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-if CONFIG["TARGET_CPU"] == "arm":
-
@@ -110068,41 +109888,22 @@ index affa5998b64e..0fbfe6858f2a 100644
-if CONFIG["TARGET_CPU"] == "loongarch64":
-
- DEFINES["_GNU_SOURCE"] = True
-+ LOCAL_INCLUDES += [
-+ "/third_party/pipewire/"
-+ ]
-
+-
if CONFIG["TARGET_CPU"] == "mips32":
DEFINES["MIPS32_LE"] = True
DEFINES["MIPS_FPU_LE"] = True
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
- LOCAL_INCLUDES += [
- "/third_party/pipewire/"
-@@ -185,7 +73,6 @@ if CONFIG["TARGET_CPU"] == "mips32":
- if CONFIG["TARGET_CPU"] == "mips64":
-
- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
+-
+-if CONFIG["TARGET_CPU"] == "mips64":
+-
- DEFINES["_GNU_SOURCE"] = True
- LOCAL_INCLUDES += [
- "/third_party/pipewire/"
-@@ -194,32 +81,22 @@ if CONFIG["TARGET_CPU"] == "mips64":
if CONFIG["TARGET_CPU"] == "x86":
- DEFINES["WEBRTC_ENABLE_AVX2"] = True
-+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-+
-+ LOCAL_INCLUDES += [
-+ "/third_party/pipewire/"
-+ ]
-
- if CONFIG["TARGET_CPU"] == "x86_64":
+@@ -190,27 +69,7 @@ if CONFIG["TARGET_CPU"] == "x86_64":
DEFINES["WEBRTC_ENABLE_AVX2"] = True
-+ DEFINES["WEBRTC_USE_PIPEWIRE"] = True
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "Android":
-
@@ -110123,16 +109924,13 @@ index affa5998b64e..0fbfe6858f2a 100644
-if CONFIG["MOZ_DEBUG"] == "1" and CONFIG["OS_TARGET"] == "WINNT":
-
- DEFINES["_HAS_ITERATOR_DEBUGGING"] = "0"
-+ LOCAL_INCLUDES += [
-+ "/third_party/pipewire/"
-+ ]
-
+-
-if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "FreeBSD":
DEFINES["USE_X11"] = "1"
-@@ -233,46 +110,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
+@@ -224,26 +83,4 @@ if CONFIG["MOZ_X11"] == "1" and CONFIG["OS_TARGET"] == "Linux":
"Xrender"
]
@@ -110144,38 +109942,18 @@ index affa5998b64e..0fbfe6858f2a 100644
-
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "aarch64":
-
-- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-- LOCAL_INCLUDES += [
-- "/third_party/pipewire/"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "arm":
-
-- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-- LOCAL_INCLUDES += [
-- "/third_party/pipewire/"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86":
-
-- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-- LOCAL_INCLUDES += [
-- "/third_party/pipewire/"
-- ]
--
-if CONFIG["OS_TARGET"] == "Linux" and CONFIG["TARGET_CPU"] == "x86_64":
-
-- DEFINES["WEBRTC_USE_PIPEWIRE"] = True
- DEFINES["_GNU_SOURCE"] = True
-
-- LOCAL_INCLUDES += [
-- "/third_party/pipewire/"
-- ]
--
Library("webrtc_gn")
diff --git a/www/firefox/files/patch-third__party_sqlite3_ext_sqlite-vec_sqlite-vec.c b/www/firefox/files/patch-third__party_sqlite3_ext_sqlite-vec_sqlite-vec.c
new file mode 100644
index 000000000000..662857e65bc5
--- /dev/null
+++ b/www/firefox/files/patch-third__party_sqlite3_ext_sqlite-vec_sqlite-vec.c
@@ -0,0 +1,15 @@
+diff --git third_party/sqlite3/ext/sqlite-vec/sqlite-vec.c third_party/sqlite3/ext/sqlite-vec/sqlite-vec.c
+index 96612e26d385..c43c46136bef 100644
+--- third_party/sqlite3/ext/sqlite-vec/sqlite-vec.c
++++ third_party/sqlite3/ext/sqlite-vec/sqlite-vec.c
+@@ -11,6 +11,10 @@
+ #include <stdlib.h>
+ #include <string.h>
+
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#endif
++
+ #ifndef SQLITE_VEC_OMIT_FS
+ #include <stdio.h>
+ #endif
diff --git a/www/firefox/files/patch-toolkit_xre_nsEmbedFunctions.cpp b/www/firefox/files/patch-toolkit_xre_nsEmbedFunctions.cpp
new file mode 100644
index 000000000000..caac874012c9
--- /dev/null
+++ b/www/firefox/files/patch-toolkit_xre_nsEmbedFunctions.cpp
@@ -0,0 +1,17 @@
+diff --git toolkit/xre/nsEmbedFunctions.cpp toolkit/xre/nsEmbedFunctions.cpp
+index 9ce6af94637c..44165558f7ec 100644
+--- toolkit/xre/nsEmbedFunctions.cpp
++++ toolkit/xre/nsEmbedFunctions.cpp
+@@ -360,10 +360,12 @@ nsresult XRE_InitChildProcess(int aArgc, char* aArgv[],
+ static_cast<CrashReporter::ProcessId>(*crashHelperPidArg);
+ #endif // defined(XP_LINUX) && !defined(MOZ_WIDGET_ANDROID)
+
++#if !defined(XP_FREEBSD)
+ exceptionHandlerIsSet = CrashReporter::SetRemoteExceptionHandler(
+ std::move(*crashReporterArg), crashHelperPid);
+ MOZ_ASSERT(exceptionHandlerIsSet,
+ "Should have been able to set remote exception handler");
++#endif
+
+ if (!exceptionHandlerIsSet) {
+ // Bug 684322 will add better visibility into this condition
diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index 3bcd7b368b62..c8e94adcf1f7 100644
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME= freenginx
PORTVERSION= 1.27.2
-PORTREVISION?= 18
+PORTREVISION?= 19
CATEGORIES= www
MASTER_SITES= https://freenginx.org/download/ \
LOCAL/joneum
diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index 5767c28f0a20..c89c71cbfc96 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= nginx
PORTVERSION= 1.26.0
-PORTREVISION?= 19
+PORTREVISION?= 20
CATEGORIES= www
MASTER_SITES= https://freenginx.org/download/ \
LOCAL/joneum
diff --git a/www/galene/Makefile b/www/galene/Makefile
index 15cdbfaf3a58..8bea5d198bab 100644
--- a/www/galene/Makefile
+++ b/www/galene/Makefile
@@ -1,6 +1,5 @@
PORTNAME= galene
-DISTVERSION= 0.96
-PORTREVISION= 2
+DISTVERSION= 0.96.3
CATEGORIES= www net-im
MAINTAINER= bapt@FreeBSD.org
@@ -23,32 +22,33 @@ GH_TUPLE= \
davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
golang-jwt:jwt:v5.2.1:golang_jwt_jwt_v5/vendor/github.com/golang-jwt/jwt/v5 \
- golang:crypto:v0.29.0:golang_crypto/vendor/golang.org/x/crypto \
- golang:net:v0.30.0:golang_net/vendor/golang.org/x/net \
- golang:sys:v0.27.0:golang_sys/vendor/golang.org/x/sys \
- golang:term:v0.26.0:golang_term/vendor/golang.org/x/term \
+ golang:crypto:v0.31.0:golang_crypto/vendor/golang.org/x/crypto \
+ golang:net:v0.33.0:golang_net/vendor/golang.org/x/net \
+ golang:sys:v0.28.0:golang_sys/vendor/golang.org/x/sys \
+ golang:term:v0.27.0:golang_term/vendor/golang.org/x/term \
google:uuid:v1.6.0:google_uuid/vendor/github.com/google/uuid \
gorilla:websocket:v1.5.0:gorilla_websocket/vendor/github.com/gorilla/websocket \
jech:cert:f491cf43a77d:jech_cert/vendor/github.com/jech/cert \
jech:samplebuilder:6cbba09fc1c9:jech_samplebuilder/vendor/github.com/jech/samplebuilder \
- pion:datachannel:v1.5.9:pion_datachannel/vendor/github.com/pion/datachannel \
+ pion:datachannel:v1.5.10:pion_datachannel/vendor/github.com/pion/datachannel \
pion:dtls:v2.2.12:pion_dtls_v2/vendor/github.com/pion/dtls/v2 \
pion:ice:v2.3.37:pion_ice_v2/vendor/github.com/pion/ice/v2 \
pion:interceptor:v0.1.37:pion_interceptor/vendor/github.com/pion/interceptor \
pion:logging:v0.2.2:pion_logging/vendor/github.com/pion/logging \
pion:mdns:v0.0.12:pion_mdns/vendor/github.com/pion/mdns \
pion:randutil:v0.1.0:pion_randutil/vendor/github.com/pion/randutil \
- pion:rtcp:v1.2.14:pion_rtcp/vendor/github.com/pion/rtcp \
- pion:rtp:v1.8.9:pion_rtp/vendor/github.com/pion/rtp \
- pion:sctp:v1.8.33:pion_sctp/vendor/github.com/pion/sctp \
+ pion:rtcp:v1.2.15:pion_rtcp/vendor/github.com/pion/rtcp \
+ pion:rtp:v1.8.10:pion_rtp/vendor/github.com/pion/rtp \
+ pion:sctp:v1.8.35:pion_sctp/vendor/github.com/pion/sctp \
pion:sdp:v3.0.9:pion_sdp_v3/vendor/github.com/pion/sdp/v3 \
pion:srtp:v2.0.20:pion_srtp_v2/vendor/github.com/pion/srtp/v2 \
pion:stun:v0.6.1:pion_stun/vendor/github.com/pion/stun \
pion:transport:v2.2.10:pion_transport_v2/vendor/github.com/pion/transport/v2 \
+ pion:transport:v3.0.7:pion_transport_v3/vendor/github.com/pion/transport/v3 \
pion:turn:v2.1.6:pion_turn_v2/vendor/github.com/pion/turn/v2 \
- pion:webrtc:v3.3.4:pion_webrtc_v3/vendor/github.com/pion/webrtc/v3 \
+ pion:webrtc:v3.3.5:pion_webrtc_v3/vendor/github.com/pion/webrtc/v3 \
pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
- stretchr:testify:v1.9.0:stretchr_testify/vendor/github.com/stretchr/testify \
+ stretchr:testify:v1.10.0:stretchr_testify/vendor/github.com/stretchr/testify \
wlynxg:anet:v0.0.5:wlynxg_anet/vendor/github.com/wlynxg/anet
CGO_ENABLED= 0
diff --git a/www/galene/distinfo b/www/galene/distinfo
index 9bb0479c504f..0191b7d04ad1 100644
--- a/www/galene/distinfo
+++ b/www/galene/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1735802329
-SHA256 (jech-galene-0.96-galene-0.96_GH0.tar.gz) = fc689fccc718943909cd7585a94574c4a7f7b4168c41028d0d22c73cf6b2dcd6
-SIZE (jech-galene-0.96-galene-0.96_GH0.tar.gz) = 778766
+TIMESTAMP = 1747332374
+SHA256 (jech-galene-0.96.3-galene-0.96.3_GH0.tar.gz) = c76e5b6c059b94d102c2b726ab144ba6a70bdde8135f6733893217172af5201a
+SIZE (jech-galene-0.96.3-galene-0.96.3_GH0.tar.gz) = 888837
SHA256 (at-wat-ebml-go-v0.17.1_GH0.tar.gz) = f058fcf7f4da9f979531a0ba1f811fc34c8d9d30087ba8d442eef220e726cbe3
SIZE (at-wat-ebml-go-v0.17.1_GH0.tar.gz) = 69882
SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
@@ -9,14 +9,14 @@ SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedace
SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173
SHA256 (golang-jwt-jwt-v5.2.1_GH0.tar.gz) = 76d1c81a7cd38ed03309f770f60ac3417f16c75b4c53a0c01bb783863783fef0
SIZE (golang-jwt-jwt-v5.2.1_GH0.tar.gz) = 61340
-SHA256 (golang-crypto-v0.29.0_GH0.tar.gz) = 0f1f747a65c883857c5f6c54b01e228536698dcc5af652386ccfc994c2a3c991
-SIZE (golang-crypto-v0.29.0_GH0.tar.gz) = 1847528
-SHA256 (golang-net-v0.30.0_GH0.tar.gz) = c5bcae30a04fc5c9d6fccfceb368cc1a46413eefdccefdea57336e2b11a1fbfa
-SIZE (golang-net-v0.30.0_GH0.tar.gz) = 1456700
-SHA256 (golang-sys-v0.27.0_GH0.tar.gz) = 91f2021c81184dccca54272abfdfa7f6d0b43fcdf7e36c4d62c1ab597e7988a9
-SIZE (golang-sys-v0.27.0_GH0.tar.gz) = 1518154
-SHA256 (golang-term-v0.26.0_GH0.tar.gz) = 860d9dc2e32939c99ea3590171d8897ca6b876958085fd210d7331787c1ad00b
-SIZE (golang-term-v0.26.0_GH0.tar.gz) = 14688
+SHA256 (golang-crypto-v0.31.0_GH0.tar.gz) = 36e325f89d4cd03ec568d92c74d6affd2b1fb88fcdc63aeb15d1df41e11200ca
+SIZE (golang-crypto-v0.31.0_GH0.tar.gz) = 1837859
+SHA256 (golang-net-v0.33.0_GH0.tar.gz) = 675e0ceaf54baf4f6e2a5152fe148906119c97e7b1d37d1c44ec2621faeab0e8
+SIZE (golang-net-v0.33.0_GH0.tar.gz) = 1466426
+SHA256 (golang-sys-v0.28.0_GH0.tar.gz) = 62726b1ccbb09c7e8de2215756a26012751bdded12b5bacc6de83296db694ebf
+SIZE (golang-sys-v0.28.0_GH0.tar.gz) = 1519898
+SHA256 (golang-term-v0.27.0_GH0.tar.gz) = 4053cac47f4fcd6e38fe80ed4e52a10550681109a09ff7a6cabdb6e1af6bb5a6
+SIZE (golang-term-v0.27.0_GH0.tar.gz) = 14689
SHA256 (google-uuid-v1.6.0_GH0.tar.gz) = ee63376b5675376c60e055ed66e5f3651ccc703bd580c022b8ad00cea309252d
SIZE (google-uuid-v1.6.0_GH0.tar.gz) = 20896
SHA256 (gorilla-websocket-v1.5.0_GH0.tar.gz) = 5d86f9e1c76ff7ceca0747f78b79864fbaec9d440f4fdb03197466e5102a86b0
@@ -25,8 +25,8 @@ SHA256 (jech-cert-f491cf43a77d_GH0.tar.gz) = a31c5dc063e19e49e27454e9ffd12fd0895
SIZE (jech-cert-f491cf43a77d_GH0.tar.gz) = 3756
SHA256 (jech-samplebuilder-6cbba09fc1c9_GH0.tar.gz) = 08082afa77f3083c0b15ed09fe27d43c525bc31af3662e13288dd167a609c2ad
SIZE (jech-samplebuilder-6cbba09fc1c9_GH0.tar.gz) = 12428
-SHA256 (pion-datachannel-v1.5.9_GH0.tar.gz) = b23a0532f6a70ba3eae2a8052285f01545866fb56dd30cb12cd1f616bbb8eb8f
-SIZE (pion-datachannel-v1.5.9_GH0.tar.gz) = 17018
+SHA256 (pion-datachannel-v1.5.10_GH0.tar.gz) = 07b7d4decbc83e84f00ce2c1587f55579aa5c018379c8e17c7d6c681df5c8eb6
+SIZE (pion-datachannel-v1.5.10_GH0.tar.gz) = 17048
SHA256 (pion-dtls-v2.2.12_GH0.tar.gz) = 17d45dba2712a9fff680f1e441b26566daf7f9103656fd3f65d05fda0b5e0009
SIZE (pion-dtls-v2.2.12_GH0.tar.gz) = 152165
SHA256 (pion-ice-v2.3.37_GH0.tar.gz) = e935cbc70fb9344c5407b4a7cd3c7299d2db3bd4a5785346b040a102d5a5380d
@@ -39,12 +39,12 @@ SHA256 (pion-mdns-v0.0.12_GH0.tar.gz) = d291ea4260996731e09103beb498f6e1b9fd3643
SIZE (pion-mdns-v0.0.12_GH0.tar.gz) = 17490
SHA256 (pion-randutil-v0.1.0_GH0.tar.gz) = 4b0301915ebbfa77c8621cebf99c6c7d71651762a33ce4fa4e6af8994ecd4993
SIZE (pion-randutil-v0.1.0_GH0.tar.gz) = 7521
-SHA256 (pion-rtcp-v1.2.14_GH0.tar.gz) = ab0674ed126edfafc8dcb1c70d269cf04d6498983e5ebe92c9c8ea776234d660
-SIZE (pion-rtcp-v1.2.14_GH0.tar.gz) = 59682
-SHA256 (pion-rtp-v1.8.9_GH0.tar.gz) = c4174853bc2cd78193621e7c96b72ba5f52edaa88e98b8e79b531bc943f225fd
-SIZE (pion-rtp-v1.8.9_GH0.tar.gz) = 62171
-SHA256 (pion-sctp-v1.8.33_GH0.tar.gz) = ffeac32cbdc684462701aae276106e1912b86b470242b886e1a8866e4a74c51b
-SIZE (pion-sctp-v1.8.33_GH0.tar.gz) = 94390
+SHA256 (pion-rtcp-v1.2.15_GH0.tar.gz) = b3032a27547fe6a2d2468db5925399b8e13aec3770788db98b91c327bb54695f
+SIZE (pion-rtcp-v1.2.15_GH0.tar.gz) = 61468
+SHA256 (pion-rtp-v1.8.10_GH0.tar.gz) = f998acdb35dc3c8741fc4198b240342bc549777db6414adc75e70765e1cac57a
+SIZE (pion-rtp-v1.8.10_GH0.tar.gz) = 62142
+SHA256 (pion-sctp-v1.8.35_GH0.tar.gz) = 780d450604fd9eafcc1f2b93f42d0c0ca690be8c57770e6a3cc817270ac37821
+SIZE (pion-sctp-v1.8.35_GH0.tar.gz) = 96553
SHA256 (pion-sdp-v3.0.9_GH0.tar.gz) = d0de98412c90f90379297f00c7b766a8bbf129672d2e896d3bcd780d37f35e60
SIZE (pion-sdp-v3.0.9_GH0.tar.gz) = 28358
SHA256 (pion-srtp-v2.0.20_GH0.tar.gz) = 8156afe373b0f6f43dbbbd56deca6b32f039d9995d0b6bd3c2757c1630b5443e
@@ -53,13 +53,15 @@ SHA256 (pion-stun-v0.6.1_GH0.tar.gz) = 6abda07e177b9f65412e3b11dae6a35663869ebec
SIZE (pion-stun-v0.6.1_GH0.tar.gz) = 91808
SHA256 (pion-transport-v2.2.10_GH0.tar.gz) = 112640b7644824e3e63426bfd23712bcaadab670e3171f86c34948863b5ff0ff
SIZE (pion-transport-v2.2.10_GH0.tar.gz) = 90002
+SHA256 (pion-transport-v3.0.7_GH0.tar.gz) = dca2f4ede133623bfb1f2d1a055e500c80ef3faa39ad9db4d45086d60c7458b5
+SIZE (pion-transport-v3.0.7_GH0.tar.gz) = 85680
SHA256 (pion-turn-v2.1.6_GH0.tar.gz) = 243841be67659ad71437e818b82c4032731cf1a3ad73e948bf3abbe27a5addb5
SIZE (pion-turn-v2.1.6_GH0.tar.gz) = 131516
-SHA256 (pion-webrtc-v3.3.4_GH0.tar.gz) = 90ffd02e21676079b5e4a50ac4a310bff8f707fdc4d75812c347d26460c22286
-SIZE (pion-webrtc-v3.3.4_GH0.tar.gz) = 386093
+SHA256 (pion-webrtc-v3.3.5_GH0.tar.gz) = 93ff5d7860d94a1411bd532d9d4e1affb0e8d99e83e36c2a7596d753438e2cb8
+SIZE (pion-webrtc-v3.3.5_GH0.tar.gz) = 386477
SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
-SHA256 (stretchr-testify-v1.9.0_GH0.tar.gz) = ee651d4d4427d55096007190398102383498e6b5cf97ea9e89ad6e72b4115fbb
-SIZE (stretchr-testify-v1.9.0_GH0.tar.gz) = 108663
+SHA256 (stretchr-testify-v1.10.0_GH0.tar.gz) = 06af5143ab5fc8f2fbf3d1420a5f002f6383cd7de911698dbd1822beacb27684
+SIZE (stretchr-testify-v1.10.0_GH0.tar.gz) = 112732
SHA256 (wlynxg-anet-v0.0.5_GH0.tar.gz) = bf9a401124ec58f00413b5597fc7f9ced9abd3314ec62ce49021c4c7b023d47e
SIZE (wlynxg-anet-v0.0.5_GH0.tar.gz) = 5475910
diff --git a/www/gitlab-pages/distinfo b/www/gitlab-pages/distinfo
index 053a191e267d..6f87e2d492e8 100644
--- a/www/gitlab-pages/distinfo
+++ b/www/gitlab-pages/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1746703453
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.11.2/go.mod) = b83da7e72c96e7faf9b45df5ea511c394c921e0a377adec8673636f904354f99
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.11.2/go.mod) = 3435
-SHA256 (go/www_gitlab-pages/gitlab-pages-v17.11.2/gitlab-pages-v17.11.2.tar.bz2) = a6d2e709921db3e1e68cab33e90c6e8ae161bf6cdaa13cf2772a0a15db2636f4
-SIZE (go/www_gitlab-pages/gitlab-pages-v17.11.2/gitlab-pages-v17.11.2.tar.bz2) = 233507
+TIMESTAMP = 1747297293
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.0.0/go.mod) = 5d3bf245e8a23b85bf8d20e164da233946fce66407fc882c9eef3146a36bb266
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.0.0/go.mod) = 3435
+SHA256 (go/www_gitlab-pages/gitlab-pages-v18.0.0/gitlab-pages-v18.0.0.tar.bz2) = ec76aac2b7b3c3bd915eac21156f50e36ecc214f51caf9c125c69567227eab5a
+SIZE (go/www_gitlab-pages/gitlab-pages-v18.0.0/gitlab-pages-v18.0.0.tar.bz2) = 234324
diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo
index 0c0f519aee02..ce8234510990 100644
--- a/www/gitlab-workhorse/distinfo
+++ b/www/gitlab-workhorse/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1746703509
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.11.2/go.mod) = 4fea0d1f76f8078f7dc8f7b3350f05e288764e289460476fdddbc9d0d5e1bdb5
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.11.2/go.mod) = 9201
-SHA256 (go/www_gitlab-workhorse/gitlab-foss-v17.11.2/gitlab-foss-v17.11.2.tar.bz2) = cca1c17742e83a3449b262980ce6522c713eeb9f50dcba4bb831d4e3b32b8ca6
-SIZE (go/www_gitlab-workhorse/gitlab-foss-v17.11.2/gitlab-foss-v17.11.2.tar.bz2) = 127999225
+TIMESTAMP = 1747297312
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.0.0/go.mod) = 8dbcbe08dbde6db18015e8e2cd84a67a5da908501eb5d6c6d7111fe2e63d27c6
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.0.0/go.mod) = 9144
+SHA256 (go/www_gitlab-workhorse/gitlab-foss-v18.0.0/gitlab-foss-v18.0.0.tar.bz2) = 17e3c1df51b242b74ebd45ccb5ba8e0d3ca63dc63db16084d586a9dd36d79b05
+SIZE (go/www_gitlab-workhorse/gitlab-foss-v18.0.0/gitlab-foss-v18.0.0.tar.bz2) = 116971580
diff --git a/www/gitlab/Makefile b/www/gitlab/Makefile
index 4e58653e1bec..8e5a9710dc85 100644
--- a/www/gitlab/Makefile
+++ b/www/gitlab/Makefile
@@ -27,8 +27,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
# mail/rubygem-net-smtp is required as ruby 3.1 removed it
# textproc/rubygem-psych3 is required as ruby 3.1 applied an update to psych 4.0 which has breaking changes
# mail/rubygem-net-pop is required as ruby 3.1 removed it
+#gitlab-zoekt-indexer>=0.16.0:textproc/gitlab-zoekt-indexer
MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
- gitlab-elasticsearch-indexer>=5.5.0:textproc/gitlab-elasticsearch-indexer \
+ gitlab-elasticsearch-indexer>=5.5.1:textproc/gitlab-elasticsearch-indexer \
gitlab-agent>=${GITLAB_VERSION}:net/gitlab-agent \
gitlab-pages>=${GITLAB_VERSION}:www/gitlab-pages \
gitlab-shell>=14.41.0:devel/gitlab-shell \
@@ -41,17 +42,17 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-net-smtp>=0:mail/rubygem-net-smtp \
rubygem-psych3>=3.1<4:textproc/rubygem-psych3 \
rubygem-net-pop>=0:mail/rubygem-net-pop \
- rubygem-rails70>=7.0.8.7<7.1:www/rubygem-rails70 \
+ rubygem-rails-gitlab>=7.1.5.1<7.2:www/rubygem-rails-gitlab \
rubygem-mutex_m>=0.3<1:devel/rubygem-mutex_m \
rubygem-drb>=2.2.1<3:devel/rubygem-drb \
rubygem-bootsnap>=1.18.3<1.19:devel/rubygem-bootsnap \
rubygem-ffi>=1.17.1<2:devel/rubygem-ffi \
rubygem-openssl>=3.2.0<4:security/rubygem-openssl \
rubygem-gitlab-secret_detection>=0.23.0<1:security/rubygem-gitlab-secret_detection \
- rubygem-responders-rails70>=3.0<4.0:www/rubygem-responders-rails70 \
+ rubygem-responders-rails-gitlab>=3.0<4.0:www/rubygem-responders-rails-gitlab \
rubygem-sprockets3>=3.7.0<3.8:devel/rubygem-sprockets3 \
- rubygem-sprockets-rails-rails70>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails70 \
- rubygem-view_component-rails70>=3.21.0<3.22:devel/rubygem-view_component-rails70 \
+ rubygem-sprockets-rails-rails-gitlab>=3.5.2<3.6:devel/rubygem-sprockets-rails-rails-gitlab \
+ rubygem-view_component-rails-gitlab>=3.21.0<3.22:devel/rubygem-view_component-rails-gitlab \
rubygem-pg>=1.5.9<1.6:databases/rubygem-pg \
rubygem-rugged>=1.6<2:devel/rubygem-rugged \
rubygem-faraday-gitlab>=2<3:www/rubygem-faraday-gitlab \
@@ -59,10 +60,10 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-logger-gitlab>=1.6.0<1.7:devel/rubygem-logger-gitlab \
rubygem-marginalia>=1.11.1<1.12:databases/rubygem-marginalia \
rubygem-declarative_policy>=1.1.0<1.2:security/rubygem-declarative_policy \
- rubygem-coverband>=6.1.4<6.1.5:www/rubygem-coverband \
- rubygem-devise-rails70>=4.9.3<4.10:devel/rubygem-devise-rails70 \
+ rubygem-coverband>=6.1.5<6.1.6:www/rubygem-coverband \
+ rubygem-devise-rails-gitlab>=4.9.3<4.10:devel/rubygem-devise-rails-gitlab \
rubygem-bcrypt>=3.1.20<3.2:security/rubygem-bcrypt \
- rubygem-doorkeeper-rails70>=5.8.1<6:security/rubygem-doorkeeper-rails70 \
+ rubygem-doorkeeper-rails-gitlab>=5.8.1<6:security/rubygem-doorkeeper-rails-gitlab \
rubygem-doorkeeper-openid_connect>=1.8.11<2:security/rubygem-doorkeeper-openid_connect \
rubygem-doorkeeper-device_authorization_grant>=1.0.0<1.1:security/rubygem-doorkeeper-device_authorization_grant \
rubygem-rexml>=3.4.1<3.5:textproc/rubygem-rexml \
@@ -85,7 +86,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-recaptcha>=5.12<6.0:devel/rubygem-recaptcha \
rubygem-akismet>=3.0<4.0:devel/rubygem-akismet \
rubygem-invisible_captcha>=2.1.0<2.2.0:graphics/rubygem-invisible_captcha \
- rubygem-devise-two-factor41-rails70>=4.1.1<4.2:security/rubygem-devise-two-factor41-rails70 \
+ rubygem-devise-two-factor-rails-gitlab>=4.1.1<4.2:security/rubygem-devise-two-factor-rails-gitlab \
rubygem-rqrcode-gitlab>=2.2.0<3:www/rubygem-rqrcode-gitlab \
rubygem-validates_hostname>=1.0.13<1.1.0:dns/rubygem-validates_hostname \
rubygem-rubyzip>=2.3.2<2.4:archivers/rubygem-rubyzip \
@@ -105,10 +106,12 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-apollo_upload_server>=2.1.6<2.2:net/rubygem-apollo_upload_server \
rubygem-ffaker>=2.24.0<3:devel/rubygem-ffaker \
rubygem-hashie>=5.0.0<5.1:devel/rubygem-hashie \
- rubygem-kaminari-rails70>=1.2.2<1.3:www/rubygem-kaminari-rails70 \
+ rubygem-kaminari-rails-gitlab>=1.2.2<1.3:www/rubygem-kaminari-rails-gitlab \
rubygem-hamlit>=2.15.0<2.16:www/rubygem-hamlit \
rubygem-carrierwave1>=1.3.4<2.0:www/rubygem-carrierwave1 \
rubygem-mini_magick4>=4.12<5:graphics/rubygem-mini_magick4 \
+ rubygem-prawn>=0:print/rubygem-prawn \
+ rubygem-prawn-svg>=0:print/rubygem-prawn-svg \
rubygem-fog-aws328>=3.26<4:net/rubygem-fog-aws328 \
rubygem-fog-core210>=2.1.0<2.1.1:devel/rubygem-fog-core210 \
rubygem-fog-google-gitlab>=1.24.1<1.25:net/rubygem-fog-google-gitlab \
@@ -134,9 +137,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-elasticsearch-model-gitlab>=7.2<8:textproc/rubygem-elasticsearch-model-gitlab \
rubygem-elasticsearch-rails7>=7.2<8:textproc/rubygem-elasticsearch-rails7 \
rubygem-elasticsearch-api-gitlab>=7.17.11<7.18:textproc/rubygem-elasticsearch-api-gitlab \
- rubygem-aws-sdk-core-gitlab>=3.215.0<3.216:devel/rubygem-aws-sdk-core-gitlab \
+ rubygem-aws-sdk-core-gitlab>=3.223.0<3.224:devel/rubygem-aws-sdk-core-gitlab \
rubygem-aws-sdk-cloudformation-gitlab>=1<2:devel/rubygem-aws-sdk-cloudformation-gitlab \
- rubygem-aws-sdk-s3-gitlab>=1.177.0<1.178:devel/rubygem-aws-sdk-s3-gitlab \
+ rubygem-aws-sdk-s3-gitlab>=1.185.0<1.186:devel/rubygem-aws-sdk-s3-gitlab \
rubygem-faraday-typhoeus-gitlab>=1.1<2:www/rubygem-faraday-typhoeus-gitlab \
rubygem-faraday_middleware-aws-sigv4-gitlab>=1.0.1<1.1:devel/rubygem-faraday_middleware-aws-sigv4-gitlab \
rubygem-typhoeus>=1.4.0<1.5:www/rubygem-typhoeus \
@@ -156,7 +159,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-rouge-gitlab>=4.5.1<4.6:textproc/rubygem-rouge-gitlab \
rubygem-truncato>=0.7.13<0.8.0:textproc/rubygem-truncato \
rubygem-nokogiri>=1.18.7<2:textproc/rubygem-nokogiri \
- rubygem-gitlab-glfm-markdown>=0.0.29<0.1:textproc/rubygem-gitlab-glfm-markdown \
+ rubygem-gitlab-glfm-markdown>=0.0.30<0.1:textproc/rubygem-gitlab-glfm-markdown \
rubygem-tanuki_emoji>=0.13<1:graphics/rubygem-tanuki_emoji \
rubygem-unicode-emoji>=4.0.4<5:devel/rubygem-unicode-emoji \
rubygem-icalendar-gitlab>=2.10.3<2.11:devel/rubygem-icalendar-gitlab \
@@ -167,20 +170,20 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \
rubygem-sidekiq-gitlab>=7.3.9:devel/rubygem-sidekiq-gitlab \
- rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \
+ rubygem-sidekiq-cron-rails-gitlab>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails-gitlab \
rubygem-fugit>=1.11.1<1.12:devel/rubygem-fugit \
rubygem-httparty-gitlab>=0.22.0<0.23:www/rubygem-httparty-gitlab \
rubygem-rainbow>=3.1.1<4.0:devel/rubygem-rainbow \
rubygem-ruby-progressbar>=1.11<2:devel/rubygem-ruby-progressbar \
rubygem-re2>=2.15.0<3:devel/rubygem-re2 \
- rubygem-semver_dialects>=3.6.0<4:devel/rubygem-semver_dialects \
+ rubygem-semver_dialects>=3.7.0<4:devel/rubygem-semver_dialects \
rubygem-version_sorter>=2.3<3:textproc/rubygem-version_sorter \
rubygem-js_regex>=3.8<4.0:textproc/rubygem-js_regex \
rubygem-device_detector>=0:devel/rubygem-device_detector \
rubygem-redis>=5.4.0<5.5:databases/rubygem-redis \
rubygem-redis-clustering>=5.4.0<5.5:databases/rubygem-redis-clustering \
rubygem-connection_pool>=2.5.0<3.0:net/rubygem-connection_pool \
- rubygem-redis-actionpack-rails70>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails70 \
+ rubygem-redis-actionpack-rails-gitlab>=5.5.0<5.6:databases/rubygem-redis-actionpack-rails-gitlab \
rubygem-discordrb-webhooks>=3.5<4.0:net-im/rubygem-discordrb-webhooks \
rubygem-jira-ruby>=2.3.0<2.4:devel/rubygem-jira-ruby \
rubygem-atlassian-jwt>=0.2.1<0.3.0:www/rubygem-atlassian-jwt \
@@ -199,29 +202,29 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-gitlab-chronic>=0.10.6<0.11.0:devel/rubygem-gitlab-chronic \
rubygem-gitlab_chronic_duration>=0.12<1:devel/rubygem-gitlab_chronic_duration \
rubygem-rack-proxy>=0.7.7<0.8.0:www/rubygem-rack-proxy \
- rubygem-cssbundling-rails-rails70>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails70 \
+ rubygem-cssbundling-rails-rails-gitlab>=1.4.3<1.5:www/rubygem-cssbundling-rails-rails-gitlab \
rubygem-terser>=1.0.2<1.0.3:textproc/rubygem-terser \
rubygem-addressable>=2.8<3:www/rubygem-addressable \
- rubygem-gon-rails70>=6.4.0<6.5:www/rubygem-gon-rails70 \
+ rubygem-gon-rails-gitlab>=6.4.0<6.5:www/rubygem-gon-rails-gitlab \
rubygem-request_store>=1.7.0<1.8:devel/rubygem-request_store \
rubygem-base32>=0.3.4<0.4.0:converters/rubygem-base32 \
rubygem-gitlab-license>=2.6<3:devel/rubygem-gitlab-license \
rubygem-rack-attack>=6.7.0<6.8:www/rubygem-rack-attack \
- rubygem-sentry-ruby>=5.22.0<5.23:devel/rubygem-sentry-ruby \
- rubygem-sentry-rails>=5.22.0<5.23:devel/rubygem-sentry-rails \
- rubygem-sentry-sidekiq>=5.22.0<5.23:devel/rubygem-sentry-sidekiq \
+ rubygem-sentry-ruby>=5.23.0<5.24:devel/rubygem-sentry-ruby \
+ rubygem-sentry-rails>=5.23.0<5.24:devel/rubygem-sentry-rails \
+ rubygem-sentry-sidekiq>=5.23.0<5.24:devel/rubygem-sentry-sidekiq \
rubygem-pg_query>=6.1.0<6.2:databases/rubygem-pg_query \
- rubygem-premailer-rails-rails70>=1.12.0<1.13:mail/rubygem-premailer-rails-rails70 \
+ rubygem-premailer-rails-rails-gitlab>=1.12.0<1.13:mail/rubygem-premailer-rails-rails-gitlab \
rubygem-gitlab-labkit>=0.37.0<0.38:devel/rubygem-gitlab-labkit \
rubygem-thrift>=0.16.0:devel/rubygem-thrift \
- rubygem-rails-i18n-rails70>=7.0.9<8:devel/rubygem-rails-i18n-rails70 \
+ rubygem-rails-i18n-rails-gitlab>=7.0.9<8:devel/rubygem-rails-i18n-rails-gitlab \
rubygem-gettext_i18n_rails>=1.13.0<1.14:devel/rubygem-gettext_i18n_rails \
rubygem-gettext>=3.5.1<4:devel/rubygem-gettext \
rubygem-batch-loader>=2.0.5<2.1:devel/rubygem-batch-loader \
rubygem-tty-prompt>=0.23<1:devel/rubygem-tty-prompt \
- rubygem-peek-rails70>=1.1<2.0:devel/rubygem-peek-rails70 \
+ rubygem-peek-rails-gitlab>=1.1<2.0:devel/rubygem-peek-rails-gitlab \
rubygem-snowplow-tracker>=0.8.0<1:devel/rubygem-snowplow-tracker \
- rubygem-webrick>=1.8.2<1.10:www/rubygem-webrick \
+ rubygem-webrick>=1.9.0<1.10:www/rubygem-webrick \
rubygem-prometheus-client-mmap>=1.2.9<1.3:devel/rubygem-prometheus-client-mmap \
rubygem-async-gitlab>=2.23.1<2.24:devel/rubygem-async-gitlab \
rubygem-gitlab-security_report_schemas>=0.1.2.min15.0.0.max15.2.1<0.1.2.min15.0.0.max15.2.2:devel/rubygem-gitlab-security_report_schemas \
@@ -250,7 +253,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-opentelemetry-instrumentation-sidekiq>=0.25.7:devel/rubygem-opentelemetry-instrumentation-sidekiq \
rubygem-warning>=1.5.0<1.6:devel/rubygem-warning \
rubygem-git>=1.19.1<2:devel/rubygem-git \
- rubygem-gitlab-dangerfiles>=4.8.1<4.9:devel/rubygem-gitlab-dangerfiles \
+ rubygem-gitlab-dangerfiles>=4.9.0<4.10:devel/rubygem-gitlab-dangerfiles \
rubygem-license_finder-gitlab>=7.2.1<8:devel/rubygem-license_finder-gitlab \
rubygem-rspec>=3.0<4:devel/rubygem-rspec \
rubygem-octokit-gitlab>=9.0<10:net/rubygem-octokit-gitlab \
@@ -263,7 +266,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-memory_profiler>=1.0<2.0:devel/rubygem-memory_profiler \
rubygem-activerecord-explain-analyze>=0.1<1.0:databases/rubygem-activerecord-explain-analyze \
rubygem-oauth2-gitlab>=2.0<3:net/rubygem-oauth2-gitlab \
- rubygem-health_check-rails70>=3.0<4:devel/rubygem-health_check-rails70 \
+ rubygem-health_check-rails-gitlab>=3.0<4:devel/rubygem-health_check-rails-gitlab \
rubygem-vmstat>=2.3.1<2.4.0:sysutils/rubygem-vmstat \
rubygem-sys-filesystem14>=1.4.3<1.5:sysutils/rubygem-sys-filesystem14 \
rubygem-net-ntp>0:net/rubygem-net-ntp \
@@ -275,13 +278,13 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-google-protobuf3>=3.25.6<4:devel/rubygem-google-protobuf3 \
rubygem-toml-rb>=2.2.0<3:www/rubygem-toml-rb \
rubygem-flipper-gitlab>=0.28.0<0.29:devel/rubygem-flipper-gitlab \
- rubygem-flipper-active_record-rails70>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails70 \
- rubygem-flipper-active_support_cache_store-rails70>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails70 \
+ rubygem-flipper-active_record-rails-gitlab>=0.28.0<0.29:databases/rubygem-flipper-active_record-rails-gitlab \
+ rubygem-flipper-active_support_cache_store-rails-gitlab>=0.28.0<0.29:devel/rubygem-flipper-active_support_cache_store-rails-gitlab \
rubygem-unleash>=3.2.2<3.3:devel/rubygem-unleash \
rubygem-gitlab-experiment>=0.9.1<0.10:devel/rubygem-gitlab-experiment \
- rubygem-lograge-rails70>=0.11.2<1.0:www/rubygem-lograge-rails70 \
+ rubygem-lograge-rails-gitlab>=0.11.2<1.0:www/rubygem-lograge-rails-gitlab \
rubygem-grape_logging>=1.8.4<2.0:devel/rubygem-grape_logging \
- rubygem-gitlab-net-dns>=0.10.0<0.11:dns/rubygem-gitlab-net-dns \
+ rubygem-gitlab-net-dns>=0.12.0<0.13:dns/rubygem-gitlab-net-dns \
rubygem-countries>=4.1.3<4.2.0:devel/rubygem-countries \
rubygem-retriable>=3.1.2<3.2.0:devel/rubygem-retriable \
rubygem-lru_redux>0:devel/rubygem-lru_redux \
@@ -289,7 +292,7 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-lockbox>=1.3.0<1.4:security/rubygem-lockbox \
rubygem-valid_email>=0.1<1:mail/rubygem-valid_email \
rubygem-jsonb_accessor>=1.4<2:www/rubygem-jsonb_accessor \
- rubygem-json>=2.10.2<2.11:devel/rubygem-json \
+ rubygem-json>=2.11.2<2.12:devel/rubygem-json \
rubygem-json_schemer>=2.3.0<2.4:devel/rubygem-json_schemer \
rubygem-oj>=3.16.0<3.17:devel/rubygem-oj \
rubygem-oj-introspect>=0.8<1:devel/rubygem-oj-introspect \
@@ -298,10 +301,10 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-webauthn>=3.0<4:security/rubygem-webauthn \
rubygem-ipaddress>=0.8.3<0.9:net/rubygem-ipaddress \
rubygem-parslet1>=1.8<2:textproc/rubygem-parslet1 \
- rubygem-ed25519>=1.3.0<1.4:security/rubygem-ed25519 \
+ rubygem-ed25519>=1.4.0<1.5:security/rubygem-ed25519 \
rubygem-cvss-suite>=3.3.0<3.4:security/rubygem-cvss-suite \
rubygem-arr-pm>=0.0.12<0.1:devel/rubygem-arr-pm \
- rubygem-devfile>=0.4.3<0.5:net/rubygem-devfile \
+ rubygem-devfile>=0.4.4<0.5:net/rubygem-devfile \
rubygem-CFPropertyList-gitlab>=3.0.7<3.1:devel/rubygem-CFPropertyList-gitlab \
rubygem-app_store_connect>=0:net/rubygem-app_store_connect \
rubygem-telesignenterprise>=2.2<3:devel/rubygem-telesignenterprise \
@@ -311,9 +314,9 @@ MY_DEPENDS= gitaly>=${GITLAB_VERSION}:devel/gitaly \
rubygem-uri-gitlab>=0.13.2<0.13.3:net/rubygem-uri-gitlab \
rubygem-duo_api>=1.4<2:security/rubygem-duo_api \
rubygem-gitlab-sdk>=0.3.0<0.4:devel/rubygem-gitlab-sdk \
- rubygem-paper_trail>=15.0<16:devel/rubygem-paper_trail \
+ rubygem-paper_trail>=16.0<17:devel/rubygem-paper_trail \
rubygem-i18n_data>=0.13.1<1:devel/rubygem-i18n_data \
- rubygem-gitlab-cloud-connector>=1.5<2:security/rubygem-gitlab-cloud-connector \
+ rubygem-gitlab-cloud-connector>=1.11<2:security/rubygem-gitlab-cloud-connector \
rubygem-google-cloud-profiler-v2>=0.3<1:textproc/rubygem-google-cloud-profiler-v2 \
rubygem-parallel>=1.26.3<2:sysutils/rubygem-parallel \
rubygem-google-cloud-storage_transfer-gitlab>=1.2.0<1.3:net/rubygem-google-cloud-storage_transfer-gitlab \
@@ -488,8 +491,6 @@ post-install:
@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/2_plan" >> ${TMPPLIST}
@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/4_verify" >> ${TMPPLIST}
@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/5_package" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/6_release" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/7_configure" >> ${TMPPLIST}
@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/api/8_monitor" >> ${TMPPLIST}
@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/5_package" >> ${TMPPLIST}
@${ECHO_CMD} "@dir ${WWWDIR_REL}/qa/qa/specs/features/browser_ui/8_monitor" >> ${TMPPLIST}
@@ -534,9 +535,7 @@ post-install:
@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/gems/gitlab-backup-cli/tmp" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/4_verify" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/5_package" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/6_release" >> ${TMPPLIST}
@${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/api/8_monitor" >> ${TMPPLIST}
- @${ECHO_CMD} "@dir(,,744) ${WWWDIR_REL}/qa/qa/specs/features/ee/browser_ui/7_configure" >> ${TMPPLIST}
.endif
.if !defined(_GITLAB_MAKESUM_GUARD)
@@ -550,6 +549,21 @@ makesum:
(cd ../../www/gitlab-pages && ${MAKE} makesum)
(cd ../../www/gitlab-workhorse && ${MAKE} makesum)
(cd ../../net/rubygem-gitlab-kas-grpc && ${MAKE} makesum)
+ (cd ../../www/rubygem-rails-gitlab && ${MAKE} makesum)
+ (cd ../../www/rubygem-actioncable-gitlab && ${MAKE} makesum)
+ (cd ../../mail/rubygem-actionmailbox-gitlab && ${MAKE} makesum)
+ (cd ../../mail/rubygem-actionmailer-gitlab && ${MAKE} makesum)
+ (cd ../../www/rubygem-actionpack-gitlab && ${MAKE} makesum)
+ (cd ../../textproc/rubygem-actiontext-gitlab && ${MAKE} makesum)
+ (cd ../../devel/rubygem-actionview-gitlab && ${MAKE} makesum)
+ (cd ../../devel/rubygem-activejob-gitlab && ${MAKE} makesum)
+ (cd ../../databases/rubygem-activemodel-gitlab && ${MAKE} makesum)
+ (cd ../../databases/rubygem-activerecord-gitlab && ${MAKE} makesum)
+ (cd ../../net/rubygem-activestorage-gitlab && ${MAKE} makesum)
+ (cd ../../devel/rubygem-activesupport-gitlab && ${MAKE} makesum)
+ (cd ../../www/rubygem-railties-gitlab && ${MAKE} makesum)
+ (cd ../../databases/rubygem-globalid-rails-gitlab && ${MAKE} makesum)
+ (cd ../../www/rubygem-responders-rails-gitlab && ${MAKE} makesum)
.endif
diff --git a/www/gitlab/Makefile.common b/www/gitlab/Makefile.common
index f90240ab03de..9e0f66298ff7 100644
--- a/www/gitlab/Makefile.common
+++ b/www/gitlab/Makefile.common
@@ -1,4 +1,4 @@
-GITLAB_VERSION= 17.11.2
+GITLAB_VERSION= 18.0.0
GITLAB_PORTREVISION= 0
# Git version gitaly should use (from gitlab mirror)
@@ -12,3 +12,6 @@ GITLAB_GIT_VERSION_SHORT= ${GITLAB_GIT_VERSION:C/^([0-9]*\.[0-9]*)\..*/\1/}
GITLAB_KAS_GRPC_VERSION= ${GITLAB_VERSION}
#GITLAB_KAS_GRPC_VERSION= 17.11.0.pre.rc43
+# Rails version
+RAILS_VERSION= 7.1.5.1
+
diff --git a/www/gitlab/distinfo b/www/gitlab/distinfo
index 481d3318a987..3c1c169ae9a0 100644
--- a/www/gitlab/distinfo
+++ b/www/gitlab/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1746703370
-SHA256 (gitlab-foss-v17.11.2.tar.bz2) = cca1c17742e83a3449b262980ce6522c713eeb9f50dcba4bb831d4e3b32b8ca6
-SIZE (gitlab-foss-v17.11.2.tar.bz2) = 127999225
-TIMESTAMP = 1746703439
-SHA256 (gitlab-v17.11.2-ee.tar.bz2) = 972e2fd9d5dcc6de5472fe720e369a2a3be9eb3c27208d6e82b2e9135bbd0b41
-SIZE (gitlab-v17.11.2-ee.tar.bz2) = 142504844
+TIMESTAMP = 1747397695
+SHA256 (gitlab-foss-v18.0.0.tar.bz2) = 17e3c1df51b242b74ebd45ccb5ba8e0d3ca63dc63db16084d586a9dd36d79b05
+SIZE (gitlab-foss-v18.0.0.tar.bz2) = 116971580
+TIMESTAMP = 1747397696
+SHA256 (gitlab-v18.0.0-ee.tar.bz2) = 190b986c8b73f4252bf0750536577251019102d35493236feec4e8dc19865ef6
+SIZE (gitlab-v18.0.0-ee.tar.bz2) = 131774611
diff --git a/www/gitlab/files/patch-Gemfile b/www/gitlab/files/patch-Gemfile
index 408e873e25c9..fff952d72391 100644
--- a/www/gitlab/files/patch-Gemfile
+++ b/www/gitlab/files/patch-Gemfile
@@ -1,6 +1,6 @@
---- Gemfile.orig 2025-05-07 09:41:59 UTC
+--- Gemfile.orig 2025-05-14 17:45:50 UTC
+++ Gemfile
-@@ -168,8 +168,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
+@@ -160,8 +160,8 @@ gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', fea
gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
# GraphQL API
@@ -11,7 +11,7 @@
gem 'apollo_upload_server', '~> 2.1.6', feature_category: :api
# Cells
-@@ -220,7 +220,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ
+@@ -216,7 +216,7 @@ gem 'google-cloud-storage', '~> 1.45.0', feature_categ
gem 'google-apis-storage_v1', '~> 0.29', feature_category: :shared
gem 'google-cloud-storage', '~> 1.45.0', feature_category: :shared
# We need >= 0.11.1 because that's when match_glob support is added to list_objects
@@ -20,7 +20,7 @@
gem 'google-apis-compute_v1', '~> 0.57.0', feature_category: :shared
gem 'google-apis-container_v1', '~> 0.43.0', feature_category: :shared
gem 'google-apis-container_v1beta1', '~> 0.43.0', feature_category: :shared
-@@ -231,7 +231,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe
+@@ -227,7 +227,7 @@ gem 'google-apis-androidpublisher_v3', '~> 0.34.0', fe
gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
gem 'google-apis-androidpublisher_v3', '~> 0.34.0', feature_category: :shared
@@ -29,7 +29,7 @@
gem 'google-cloud-artifact_registry-v1', '~> 0.11.0', feature_category: :shared
gem 'google-cloud-compute-v1', '~> 2.6.0', feature_category: :shared
-@@ -287,7 +287,7 @@ group :puma do
+@@ -283,7 +283,7 @@ group :puma do
gem 'rack-timeout', '~> 0.7.0', require: 'rack/timeout/base', feature_category: :shared
group :puma do
@@ -38,7 +38,7 @@
gem 'sd_notify', '~> 0.1.0', require: false, feature_category: :shared
end
-@@ -295,7 +295,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
+@@ -291,7 +291,7 @@ gem 'state_machines-activerecord', '~> 0.8.0', feature
gem 'state_machines-activerecord', '~> 0.8.0', feature_category: :shared
# Background jobs
@@ -47,23 +47,16 @@
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :scalability
gem 'gitlab-sidekiq-fetcher',
path: 'vendor/gems/sidekiq-reliable-fetch',
-@@ -433,7 +433,7 @@ gem 'snowplow-tracker', '~> 0.8.0', feature_category:
- gem 'snowplow-tracker', '~> 0.8.0', feature_category: :product_analytics
-
- # Metrics
--gem 'webrick', '~> 1.8.1', require: false, feature_category: :shared
-+gem 'webrick', '~> 1.8', require: false, feature_category: :shared
- gem 'prometheus-client-mmap', '~> 1.2.8', require: 'prometheus/client', feature_category: :shared
-
- # Event-driven reactor for Ruby
-@@ -475,140 +475,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
+@@ -471,143 +471,15 @@ gem 'warning', '~> 1.5.0', feature_category: :shared
gem 'warning', '~> 1.5.0', feature_category: :shared
-group :development do
- gem 'lefthook', '~> 1.11.0', require: false, feature_category: :tooling
- gem 'rubocop', feature_category: :tooling
-- gem 'solargraph', '~> 0.47.2', require: false, feature_category: :shared
+-
+- gem 'solargraph', '~> 0.54.0', require: false, feature_category: :shared
+- gem 'solargraph-rspec', '~> 0.5.1', require: false, feature_category: :shared
-
- gem 'letter_opener_web', '~> 3.0.0', feature_category: :shared
- gem 'lookbook', '~> 2.3', feature_category: :shared
@@ -90,9 +83,9 @@
-end
-
-group :development, :test do
-- gem 'deprecation_toolkit', '~> 1.5.1', require: false, feature_category: :shared
+- gem 'deprecation_toolkit', '~> 2.2.3', require: false, feature_category: :shared
- gem 'bullet', '~> 7.2.0', feature_category: :shared
-- gem 'parser', '= 3.3.7.1', feature_category: :shared
+- gem 'parser', '= 3.3.8.0', feature_category: :shared
- gem 'pry-byebug', feature_category: :shared
- gem 'pry-rails', '~> 0.3.9', feature_category: :shared
- gem 'pry-shell', '~> 0.6.4', feature_category: :shared
@@ -120,7 +113,7 @@
- gem 'influxdb-client', '~> 3.1', require: false, feature_category: :tooling
-
- gem 'knapsack', '~> 4.0.0', feature_category: :tooling
-- gem 'crystalball', '~> 0.7.0', require: false, feature_category: :tooling
+- gem 'gitlab-crystalball', '~> 0.7.2', require: false, feature_category: :tooling
- gem 'test_file_finder', '~> 0.3.1', feature_category: :tooling
-
- gem 'simple_po_parser', '~> 1.1.6', require: false, feature_category: :shared
@@ -144,7 +137,7 @@
-end
-
group :development, :test, :danger do
- gem 'gitlab-dangerfiles', '~> 4.8.0', require: false, feature_category: :tooling
+ gem 'gitlab-dangerfiles', '~> 4.9.0', require: false, feature_category: :tooling
end
-group :development, :test, :coverage do
@@ -187,17 +180,18 @@
- gem 'rspec_junit_formatter', feature_category: :shared
- gem 'guard-rspec', feature_category: :shared
- gem 'axe-core-rspec', '~> 4.10.0', feature_category: :tooling
+- gem 'state_machines-rspec', '~> 0.6', feature_category: :shared
-
- # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527
- gem 'derailed_benchmarks', require: false, feature_category: :shared
-
-- gem 'gitlab_quality-test_tooling', '~> 2.8.0', require: false, feature_category: :tooling
+- gem 'gitlab_quality-test_tooling', '~> 2.10.0', require: false, feature_category: :tooling
-end
-
gem 'octokit', '~> 9.0', feature_category: :importers
# Needed by octokit: https://github.com/octokit/octokit.rb/pull/1688
gem 'faraday-multipart', '~> 1.0', feature_category: :importers
-@@ -643,16 +518,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
+@@ -642,16 +514,16 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :inside
gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
# Gitaly GRPC protocol definitions
@@ -205,8 +199,8 @@
+gem 'gitaly', '~> 17.8', feature_category: :gitaly
# KAS GRPC protocol definitions
--gem 'gitlab-kas-grpc', '~> 17.9.0.pre.rc2', feature_category: :deployment_management
-+gem 'gitlab-kas-grpc', '~> 17.9', feature_category: :deployment_management
+-gem 'gitlab-kas-grpc', '~> 17.11.0', feature_category: :deployment_management
++gem 'gitlab-kas-grpc', '~> 18.0', feature_category: :deployment_management
# Lock the version before issues below are resolved:
# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
@@ -217,8 +211,8 @@
gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
-@@ -673,7 +548,7 @@ gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :
- gem 'gitlab-net-dns', '~> 0.10.0', feature_category: :shared
+@@ -672,7 +544,7 @@ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :
+ gem 'gitlab-net-dns', '~> 0.12.0', feature_category: :shared
# Countries list
-gem 'countries', '~> 4.0.0', feature_category: :shared
@@ -226,7 +220,7 @@
gem 'retriable', '~> 3.1.2', feature_category: :shared
-@@ -754,10 +629,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
+@@ -753,10 +625,15 @@ gem 'duo_api', '~> 1.3', feature_category: :system_acc
gem 'duo_api', '~> 1.3', feature_category: :system_access
@@ -237,9 +231,9 @@
+
gem 'gitlab-sdk', '~> 0.3.0', feature_category: :application_instrumentation
- gem 'paper_trail', '~> 15.0', feature_category: :shared
+ gem 'paper_trail', '~> 16.0', feature_category: :shared
-gem "i18n_data", "~> 0.13.1", feature_category: :system_access
+gem "i18n_data", "~> 0.13", feature_category: :system_access
- gem "gitlab-cloud-connector", "~> 1.5", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
+ gem "gitlab-cloud-connector", "~> 1.11", require: 'gitlab/cloud_connector', feature_category: :cloud_connector
diff --git a/www/gitlab/files/patch-config_gitlab.yml.example b/www/gitlab/files/patch-config_gitlab.yml.example
index 09cb658db5d2..3ace91d53c65 100644
--- a/www/gitlab/files/patch-config_gitlab.yml.example
+++ b/www/gitlab/files/patch-config_gitlab.yml.example
@@ -1,6 +1,6 @@
---- config/gitlab.yml.example.orig 2025-04-16 04:05:48 UTC
+--- config/gitlab.yml.example.orig 2025-05-14 17:45:50 UTC
+++ config/gitlab.yml.example
-@@ -484,7 +484,7 @@ production: &base
+@@ -489,7 +489,7 @@ production: &base
## GitLab Pages
pages:
enabled: false
@@ -9,7 +9,7 @@
# The location where pages are stored (default: shared/pages).
# path: shared/pages
-@@ -494,9 +494,9 @@ production: &base
+@@ -499,9 +499,9 @@ production: &base
host: example.com
port: 80 # Set to 443 if you serve the pages with HTTPS
https: false # Set to true if you serve the pages with HTTPS
@@ -22,7 +22,7 @@
# File that contains the shared secret key for verifying access for gitlab-pages.
# Default is '.gitlab_pages_secret' relative to Rails.root (i.e. root of the GitLab app).
-@@ -1227,13 +1227,13 @@ production: &base
+@@ -1233,13 +1233,13 @@ production: &base
repositories:
storages: # You must have at least a `default` storage path.
default:
@@ -38,7 +38,7 @@
# archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600)
# keep_time: 604800 # default: 0 (forever) (in seconds)
# pg_schema: public # default: nil, it means that all schemas will be backed up
-@@ -1268,12 +1268,12 @@ production: &base
+@@ -1274,12 +1274,12 @@ production: &base
## GitLab Shell settings
gitlab_shell:
@@ -54,7 +54,7 @@
# Git over HTTP
upload_pack: true
-@@ -1288,7 +1288,7 @@ production: &base
+@@ -1294,7 +1294,7 @@ production: &base
workhorse:
# File that contains the secret key for verifying access for gitlab-workhorse.
# Default is '.gitlab_workhorse_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -63,7 +63,7 @@
cell:
# enabled: false
-@@ -1306,7 +1306,7 @@ production: &base
+@@ -1312,7 +1312,7 @@ production: &base
# enabled: true
# File that contains the secret key for verifying access for gitlab-kas.
# Default is '.gitlab_kas_secret' relative to Rails.root (i.e. root of the GitLab app).
@@ -72,7 +72,7 @@
# The URL to the external KAS API (used by the Kubernetes agents)
# external_url: wss://kas.example.com
-@@ -1333,13 +1333,13 @@ production: &base
+@@ -1339,13 +1339,13 @@ production: &base
## GitLab Elasticsearch settings
elasticsearch:
@@ -88,7 +88,7 @@
## Webpack settings
# If enabled, this will tell rails to serve frontend assets from the webpack-dev-server running
-@@ -1360,18 +1360,18 @@ production: &base
+@@ -1366,18 +1366,18 @@ production: &base
# Sidekiq exporter is a dedicated Prometheus metrics server optionally running alongside Sidekiq.
sidekiq_exporter:
@@ -114,7 +114,7 @@
# Web exporter is a dedicated Prometheus metrics server optionally running alongside Puma.
web_exporter:
-@@ -1598,13 +1598,13 @@ test:
+@@ -1604,13 +1604,13 @@ test:
gitaly_address: unix:tmp/tests/gitaly/praefect.socket
gitaly:
diff --git a/www/gitlab/files/patch-config_initializers_1__settings.rb b/www/gitlab/files/patch-config_initializers_1__settings.rb
index 2c8adc9a51e9..6a3c4491eb22 100644
--- a/www/gitlab/files/patch-config_initializers_1__settings.rb
+++ b/www/gitlab/files/patch-config_initializers_1__settings.rb
@@ -1,6 +1,6 @@
---- config/initializers/1_settings.rb.orig 2025-03-19 10:41:02 UTC
+--- config/initializers/1_settings.rb.orig 2025-05-14 17:45:50 UTC
+++ config/initializers/1_settings.rb
-@@ -215,11 +215,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
+@@ -216,11 +216,7 @@ Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
Settings.gitlab['user'] ||= 'git'
# External configuration may cause the ssh user to differ from the GitLab user
Settings.gitlab['ssh_user'] ||= Settings.gitlab.user
diff --git a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
index 7346dbb850eb..9844d39df8d4 100644
--- a/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
+++ b/www/gitlab/files/patch-gems_gitlab-backup-cli_gitlab-backup-cli.gemspec
@@ -1,15 +1,15 @@
---- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-03-19 10:41:02 UTC
+--- gems/gitlab-backup-cli/gitlab-backup-cli.gemspec.orig 2025-05-14 17:45:50 UTC
+++ gems/gitlab-backup-cli/gitlab-backup-cli.gemspec
-@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
-
+@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "activerecord", ">= 7"
spec.add_dependency "activesupport", ">= 7"
+ spec.add_dependency "bigdecimal", "~> 3.1"
- spec.add_dependency "googleauth", "~> 1.8.1" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019
+ spec.add_dependency "googleauth", "~> 1.8" # https://gitlab.com/gitlab-org/gitlab/-/issues/449019
spec.add_dependency "google-cloud-storage_transfer", "~> 1.2.0"
+ spec.add_dependency "mutex_m", "~> 0.3"
spec.add_dependency "pg", "~> 1.5.6"
- spec.add_dependency "rainbow", "~> 3.0"
-@@ -38,11 +38,11 @@ Gem::Specification.new do |spec|
+@@ -40,11 +40,11 @@ Gem::Specification.new do |spec|
spec.add_dependency "concurrent-ruby", "~> 1.1"
spec.add_dependency "faraday", "~> 2"
spec.add_dependency "google-protobuf", "~> 3.25", ">= 3.25.3"
diff --git a/www/gitlab/pkg-message b/www/gitlab/pkg-message
index 6428be5f3115..59992ca06610 100644
--- a/www/gitlab/pkg-message
+++ b/www/gitlab/pkg-message
@@ -6,7 +6,7 @@ Gitlab was installed successfully.
You now need to set up the various components of Gitlab, so please
follow the instructions in the guide at:
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/17.11-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/install/18.0-freebsd.md
EOM
type: install
}
@@ -20,7 +20,7 @@ EOM
If you just installed an major upgrade of GitLab, for example you
switched from 17.9.x to 17.10.x, please follow the instructions in the guide at:
-https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.10-17.11-freebsd.md
+https://gitlab.com/mfechner/freebsd-gitlab-docu/blob/master/update/17.11-18.0-freebsd.md
If you just installed an minor upgrade of GitLab please follow
the instructions in the guide at:
diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 6fa0ea62b87a..864d6c3004f2 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -1,6 +1,6 @@
PORTNAME= hugo
DISTVERSIONPREFIX= v
-DISTVERSION= 0.147.2
+DISTVERSION= 0.147.4
PORTEPOCH= 1
CATEGORIES= www
PKGNAMEPREFIX= go
diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo
index 4fbf4c8e298a..844026f970c7 100644
--- a/www/gohugo/distinfo
+++ b/www/gohugo/distinfo
@@ -1,5 +1,5 @@
-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
+TIMESTAMP = 1747741364
+SHA256 (go/www_gohugo/hugo-v0.147.4/v0.147.4.mod) = cb41ea476364590e46adc72d923c617f69d99544d2a78c743ae4608f4c43ea25
+SIZE (go/www_gohugo/hugo-v0.147.4/v0.147.4.mod) = 8036
+SHA256 (go/www_gohugo/hugo-v0.147.4/v0.147.4.zip) = e723aac853ffa451bac32b823192d8fcb78d18e378437f277e0e4c214bc126c2
+SIZE (go/www_gohugo/hugo-v0.147.4/v0.147.4.zip) = 5736653
diff --git a/www/grafana/Makefile b/www/grafana/Makefile
index 0dd96cfe8e72..6f770e49d424 100644
--- a/www/grafana/Makefile
+++ b/www/grafana/Makefile
@@ -1,18 +1,28 @@
PORTNAME= grafana
DISTVERSIONPREFIX= v
-DISTVERSION= 11.6.1
+DISTVERSION= 12.0.0
CATEGORIES= www
MASTER_SITES= https://dl.grafana.com/oss/release/ \
https://raw.githubusercontent.com/${GH_ACCOUNT}/${GH_PROJECT}/${DISTVERSIONFULL}/:gomod
DISTFILES= grafana-${DISTVERSION}.linux-amd64${EXTRACT_SUFX} \
go.mod:gomod \
go.work:gomod \
+ .citools/bra/go.mod:gomod \
+ .citools/cog/go.mod:gomod \
+ .citools/cue/go.mod:gomod \
+ .citools/golangci-lint/go.mod:gomod \
+ .citools/jb/go.mod:gomod \
+ .citools/lefthook/go.mod:gomod \
+ .citools/swagger/go.mod:gomod \
apps/advisor/go.mod:gomod \
apps/alerting/notifications/go.mod:gomod \
+ apps/dashboard/go.mod:gomod \
+ apps/folder/go.mod:gomod \
apps/investigations/go.mod:gomod \
apps/playlist/go.mod:gomod \
pkg/aggregator/go.mod:gomod \
pkg/apimachinery/go.mod:gomod \
+ pkg/apis/secret/go.mod:gomod \
pkg/apiserver/go.mod:gomod \
pkg/build/go.mod:gomod \
pkg/build/wire/go.mod:gomod \
@@ -42,14 +52,15 @@ USES= cpe go:1.24,modules
USE_GITHUB= yes
USE_RC_SUBR= grafana
-TAG= ae23ead
+TAG= 4c0e704
-GO_MODULE= github.com/grafana/grafana
GO_MOD_DIST= github
+GO_MODULE= github.com/grafana/grafana
GO_TARGET= ./pkg/cmd/grafana \
./pkg/cmd/grafana-server \
./pkg/cmd/grafana-cli
-GO_BUILDFLAGS= -ldflags="-w -X main.version=${PORTVERSION} -X main.commit=${TAG}"
+GO_BUILDFLAGS= -ldflags="-w -X main.version=${DISTVERSION} -X main.commit=${TAG} \
+ -X main.buildstamp=$$(${STAT} -f %Sm -t %s ${WRKSRC}/.gitignore)"
CONFLICTS_INSTALL= grafana*
diff --git a/www/grafana/distinfo b/www/grafana/distinfo
index 1aa24ff481fe..48c8b409e43a 100644
--- a/www/grafana/distinfo
+++ b/www/grafana/distinfo
@@ -1,41 +1,61 @@
-TIMESTAMP = 1745492346
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/grafana-11.6.1.linux-amd64.tar.gz) = 35a5efca8c535ce961217765faf8d6895c6d1c1587eaeec50d606a5cb218603b
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/grafana-11.6.1.linux-amd64.tar.gz) = 178027958
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/go.mod) = 91c7674d10c8814d15ada1bad9d1bd41c0c5e8969c5e5da1da5be85d33fe49d8
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/go.mod) = 37750
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/go.work) = 91abc49021e028c3c2a4736a1c91e473d980ae1c7540138f9e1f436a62329a81
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/go.work) = 1462
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/advisor/go.mod) = 6c61070df4915b2e6fb69f557bd105c760b941acadd3c66f3fcd57bf7d4d1585
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/advisor/go.mod) = 4058
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/alerting/notifications/go.mod) = 124a37f4bdb7a567d3a511767c1638496ecc5a1dd5f97633fcba7155faf52df6
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/alerting/notifications/go.mod) = 4797
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/investigations/go.mod) = 3c3fe091bb7aed6c745175e21ccb3e961a81f0653a84a97d7ac696258f8108c4
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/investigations/go.mod) = 4257
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/playlist/go.mod) = 8a5d285defd20e31ef83b1263e79762cdd08fe9f1e688830bdad1644279a68cd
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/apps/playlist/go.mod) = 4239
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/aggregator/go.mod) = c316078737a7666ce9cf0da5f7f7d107ade730adbbe5752732d74899c2d38b31
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/aggregator/go.mod) = 8280
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/apimachinery/go.mod) = b1b10d93f324e13169864fe92a6d93b0fb23614a6c645775d75c56d311fc3c87
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/apimachinery/go.mod) = 2516
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/apiserver/go.mod) = 4400608ae4eb0546c1918324a44f7c5f6b35fcb545756fd170fc8de9be3b83d4
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/apiserver/go.mod) = 5052
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/build/go.mod) = ec5a5dac4253889681f8888b61ad5d5059a855d72aa82dd5bcaeb80ab91101c9
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/build/go.mod) = 7764
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/build/wire/go.mod) = fbc23dcc413d6b1fa9ab71380da68211859df0e155165d4aabcf557499fb6cf6
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/build/wire/go.mod) = 330
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/codegen/go.mod) = 7eeccc07ccb7293e6051f207882ea8c9f22199b886acebbc41b6459b651904e5
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/codegen/go.mod) = 2437
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/plugins/codegen/go.mod) = 6ee06b09fab35cc0a7d99cd955d770c820b2b9c1f4cfaec53d1127302b22597e
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/plugins/codegen/go.mod) = 2233
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/promlib/go.mod) = 3d788d99106f6c4aebc9d5e5feb1eb8c52ae1504fc6224e4bf0af8f5026568fe
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/promlib/go.mod) = 6861
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/semconv/go.mod) = 102611f5bece34904bdb7928b7a852764ffb36bc25efb8ce69673a5d61ce1a86
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/semconv/go.mod) = 314
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/storage/unified/apistore/go.mod) = ac17130a28f32539688a7650c734d1b84ef5c01489c89c148b7b79a0a89746f1
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/storage/unified/apistore/go.mod) = 23405
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/storage/unified/resource/go.mod) = 15915ab2954992958d66bbded2270f043994ba6ea868720fa6d3f2d9788acc33
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/storage/unified/resource/go.mod) = 14537
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/util/xorm/go.mod) = fd0137d7c79a69fe252bde216f0f8146fbb301e344fb4f2a4c444d6379da9cb5
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/pkg/util/xorm/go.mod) = 3150
-SHA256 (go/www_grafana/grafana-grafana-v11.6.1_GH0/grafana-grafana-v11.6.1_GH0.tar.gz) = 1435ba4b47d22f906495c3f53be9f416a721b5b0ca0621533393130fff87aa73
-SIZE (go/www_grafana/grafana-grafana-v11.6.1_GH0/grafana-grafana-v11.6.1_GH0.tar.gz) = 36539394
+TIMESTAMP = 1746523933
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/grafana-12.0.0.linux-amd64.tar.gz) = b5f15e29cb815c24eaf631ebaab1729608d9c44606bdef24e5248ccbeba2e95e
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/grafana-12.0.0.linux-amd64.tar.gz) = 183576101
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/go.mod) = 6ceec7e41167dd6ccb862746961e40d0cf31c8526684bfd2c980007f205609cf
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/go.mod) = 38990
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/go.work) = 582d313125088d393e9bf0bc3e62d4ce4e01f5bca62d404de61359b32fe624a4
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/go.work) = 1420
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/bra/go.mod) = 9c26b766b230e220d3a089052ecbbc735c5813503cea96f00b98e2f426f1500b
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/bra/go.mod) = 845
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/cog/go.mod) = 85c347f1808375367fd14a913af040aaedb179768bbe0f31fb7a511f8f9c3ccb
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/cog/go.mod) = 2256
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/cue/go.mod) = ce73854fe392b493136dd8585c1d431d72cd82c244bf617073352004648a9471
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/cue/go.mod) = 1533
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/golangci-lint/go.mod) = 6697690d3f339916262d3ed0a2f10880823e19db9520e907ee840e551d8ae8ac
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/golangci-lint/go.mod) = 10518
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/jb/go.mod) = 3c425afcbd554cfb50b6b5595b91cb67d8e990c967a428c3f34186b6de745475
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/jb/go.mod) = 788
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/lefthook/go.mod) = 7a722525e0e97bc44608efd3baee778d5a96ed464acae97291ec2f67a287f7f2
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/lefthook/go.mod) = 2508
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/swagger/go.mod) = a5a2ca8a1422870edac6a4d5aa94065ddbbf9b769667077fd27a0e1d2f73bfba
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/.citools/swagger/go.mod) = 2983
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/advisor/go.mod) = 6c61070df4915b2e6fb69f557bd105c760b941acadd3c66f3fcd57bf7d4d1585
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/advisor/go.mod) = 4058
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/alerting/notifications/go.mod) = d433a9fcbea78026ef8f926b3b10f701568d04ecc9c9d61fba0d199213c592c3
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/alerting/notifications/go.mod) = 4838
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/dashboard/go.mod) = 13786f0addc30cd695e352543e1409c0ffa8857eb69a544007d9c78e218dcc21
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/dashboard/go.mod) = 6587
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/folder/go.mod) = f1b308c3d11835603f93425a59619ac600b74590b16c003bf44ce9a61787e17a
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/folder/go.mod) = 2749
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/investigations/go.mod) = 39a2dd9a2655af15232f35fda4656e5a7162dce7a22a02903185d4d8363316c1
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/investigations/go.mod) = 4319
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/playlist/go.mod) = af328216a05802c409348764579c74249af6cc944c0f87ef3f141dcfe01535de
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/apps/playlist/go.mod) = 4301
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/aggregator/go.mod) = 3d7b399ae76ee86858d2555edb186f8b106c1e2860701710914d04c57b773a36
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/aggregator/go.mod) = 8310
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apimachinery/go.mod) = 20cca84623d4bd3bd7c67de6e31fa3f433e99e42df6936ac665f645fe39fbadf
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apimachinery/go.mod) = 2472
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apis/secret/go.mod) = fa225e7fb224a25468dc0f2b247a55db248f65f9b944b7ac0f3ec5f7614de062
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apis/secret/go.mod) = 4939
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apiserver/go.mod) = 7378a27c0569587d71c6e0323718d21337c8186cf1b93df3093c1583731e5e10
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/apiserver/go.mod) = 5111
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/build/go.mod) = 45257f048442b4c6bd7ce660db2cab5d51a76378d1819ffa9ee103e82b0dfeca
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/build/go.mod) = 7931
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/build/wire/go.mod) = c4bd5ec552b8a78c51631dd0c4e5654481c6ef72d6b897fd8cdadec90d1c3db0
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/build/wire/go.mod) = 330
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/codegen/go.mod) = af218f935140c2564403f76d0b4cb2a3867ccb78558ba5f610ea5a106f4ccdbe
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/codegen/go.mod) = 2490
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/plugins/codegen/go.mod) = 14e17b15ca415ed502b6391b65e0b28a2c2682d52215ad52afe901ba2c3eb480
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/plugins/codegen/go.mod) = 2233
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/promlib/go.mod) = 99645974b2fba727e251431f916fc8fb4ecfac110cb4358af5ee0e25442ef383
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/promlib/go.mod) = 6945
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/semconv/go.mod) = dffd3c1a8b43a8c1f81c88afc7fabd07551f08a727caa6c81b21cc7f22989500
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/semconv/go.mod) = 269
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/storage/unified/apistore/go.mod) = 09bf0410097e19e63fead5f16ab2a493eb000ca8a78102592d4fb07647e0c74f
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/storage/unified/apistore/go.mod) = 23423
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/storage/unified/resource/go.mod) = ec8255b1d842f1ea1a6fb79d3b10144dc2a066c37c241621825b8e124708e0e1
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/storage/unified/resource/go.mod) = 11340
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/util/xorm/go.mod) = efd1c53e50b60912388fa292a66c6c618f3888b28bf1f58767b344fbb5b71285
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/pkg/util/xorm/go.mod) = 3135
+SHA256 (go/www_grafana/grafana-grafana-v12.0.0_GH0/grafana-grafana-v12.0.0_GH0.tar.gz) = 479b337fc101adfc8386414af053337b567c8d11480aa05499ccd929c4d70601
+SIZE (go/www_grafana/grafana-grafana-v12.0.0_GH0/grafana-grafana-v12.0.0_GH0.tar.gz) = 37646751
diff --git a/www/homer-web/Makefile b/www/homer-web/Makefile
index 24b0cf1031e0..aa1cb6536dc9 100644
--- a/www/homer-web/Makefile
+++ b/www/homer-web/Makefile
@@ -1,6 +1,6 @@
PORTNAME= homer
DISTVERSIONPREFIX= v
-DISTVERSION= 25.05.1
+DISTVERSION= 25.05.2
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 2beb55f9b52a..085dbc6db5eb 100644
--- a/www/homer-web/distinfo
+++ b/www/homer-web/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746467397
-SHA256 (homer-25.05.1/homer.zip) = dc6cec598c7c33008ea66c6a424317190d2a2aba3a54dc2f512e4dba2f088e92
-SIZE (homer-25.05.1/homer.zip) = 1135408
+TIMESTAMP = 1747630986
+SHA256 (homer-25.05.2/homer.zip) = e6b98feced71787642be3e1bbbee5dbc41e2a580228baad88fe7246a9ada3f1d
+SIZE (homer-25.05.2/homer.zip) = 1134626
diff --git a/www/homer-web/pkg-plist b/www/homer-web/pkg-plist
index b1e81603448d..7ac5b5cc0b39 100644
--- a/www/homer-web/pkg-plist
+++ b/www/homer-web/pkg-plist
@@ -19,99 +19,99 @@
%%WWWDIR%%/index.html
%%WWWDIR%%/logo.png
%%WWWDIR%%/registerSW.js
-%%WWWDIR%%/resources/AdGuardHome-BfFM9H2A.js
+%%WWWDIR%%/resources/AdGuardHome-Cu_6JEdC.js
%%WWWDIR%%/resources/AdGuardHome-Tw0vCF6f.css
-%%WWWDIR%%/resources/CopyToClipboard-CjlqRd3R.js
%%WWWDIR%%/resources/CopyToClipboard-DUc_NqZL.css
-%%WWWDIR%%/resources/DockerSocketProxy-CtBSfVQ4.js
-%%WWWDIR%%/resources/DockerSocketProxy-x5542i92.css
+%%WWWDIR%%/resources/CopyToClipboard-DnEhRlbV.js
+%%WWWDIR%%/resources/DockerSocketProxy-1behWyyp.js
+%%WWWDIR%%/resources/DockerSocketProxy-DYHxpllM.css
+%%WWWDIR%%/resources/Docuseal-CS2PfU1J.js
%%WWWDIR%%/resources/Docuseal-GTRlXpFw.css
-%%WWWDIR%%/resources/Docuseal-yh1Bp7eU.js
+%%WWWDIR%%/resources/Emby-BjICRaP_.js
%%WWWDIR%%/resources/Emby-Cc4XwFHX.css
-%%WWWDIR%%/resources/Emby-CvTs9TNE.js
-%%WWWDIR%%/resources/FreshRSS-BdJMV5mk.css
-%%WWWDIR%%/resources/FreshRSS-BtwguxfM.js
-%%WWWDIR%%/resources/Gitea-BjQsojkJ.js
+%%WWWDIR%%/resources/FreshRSS-B2oAXOny.js
+%%WWWDIR%%/resources/FreshRSS-D6eQ8Kbw.css
%%WWWDIR%%/resources/Gitea-DJOaXsSb.css
-%%WWWDIR%%/resources/Glances-D-J3iX4l.js
+%%WWWDIR%%/resources/Gitea-RRIgDn7w.js
+%%WWWDIR%%/resources/Glances-Chku44Px.js
+%%WWWDIR%%/resources/Gotify-BgzkB-3Y.js
%%WWWDIR%%/resources/Gotify-CgkfqLBJ.css
-%%WWWDIR%%/resources/Gotify-yj4dQwQn.js
-%%WWWDIR%%/resources/Healthchecks-CG-ysnp9.js
+%%WWWDIR%%/resources/Healthchecks-AObEB_xO.js
%%WWWDIR%%/resources/Healthchecks-CuXYh2ap.css
-%%WWWDIR%%/resources/HomeAssistant-4k1cqTqL.js
%%WWWDIR%%/resources/HomeAssistant-D4G66XLG.css
+%%WWWDIR%%/resources/HomeAssistant-DrPLsZar.js
%%WWWDIR%%/resources/Immich-BQJ4xb-9.css
-%%WWWDIR%%/resources/Immich-Dpmapxbu.js
-%%WWWDIR%%/resources/Jellystat-CRlyhbsa.js
+%%WWWDIR%%/resources/Immich-DlmpD0mC.js
+%%WWWDIR%%/resources/Jellystat-CbiCXDql.js
%%WWWDIR%%/resources/Jellystat-YCL3xwF6.css
-%%WWWDIR%%/resources/Lidarr-D1KR85PC.js
+%%WWWDIR%%/resources/Lidarr-CLcf-XQ6.js
%%WWWDIR%%/resources/Lidarr-Dza-1-vv.css
-%%WWWDIR%%/resources/Linkding-Fa1evqHd.js
-%%WWWDIR%%/resources/Matrix-CTCYXHVe.js
+%%WWWDIR%%/resources/Linkding-Bcj9DoPV.js
+%%WWWDIR%%/resources/Matrix-Hzvly6x7.js
%%WWWDIR%%/resources/Matrix-Q-bxbOqk.css
-%%WWWDIR%%/resources/Mealie-chMEgEVI.js
+%%WWWDIR%%/resources/Mealie-CLBYZtEP.js
+%%WWWDIR%%/resources/Medusa-DYHhrgNG.js
%%WWWDIR%%/resources/Medusa-DcXIgM3A.css
-%%WWWDIR%%/resources/Medusa-G2vEvJaZ.js
-%%WWWDIR%%/resources/Mylar-Bk6mFch6.js
%%WWWDIR%%/resources/Mylar-D14wGFq4.css
-%%WWWDIR%%/resources/Nextcloud-BkTg4YmH.js
+%%WWWDIR%%/resources/Mylar-GRac72Bx.js
+%%WWWDIR%%/resources/Nextcloud-BNQ1Lusd.js
%%WWWDIR%%/resources/Nextcloud-v71Ld_Cv.css
-%%WWWDIR%%/resources/OctoPrint-B1Yz07FH.js
+%%WWWDIR%%/resources/OctoPrint-CZYpZFzI.js
%%WWWDIR%%/resources/OctoPrint-DqTJwI-L.css
-%%WWWDIR%%/resources/Olivetin-CMt84iMk.js
+%%WWWDIR%%/resources/Olivetin-BGNKkrOb.js
%%WWWDIR%%/resources/Olivetin-D8ESXpq5.css
+%%WWWDIR%%/resources/OpenHAB-3FFnMtMR.js
%%WWWDIR%%/resources/OpenHAB-BjwTZqa0.css
-%%WWWDIR%%/resources/OpenHAB-DqO798QH.js
-%%WWWDIR%%/resources/OpenWeather-BKPkxLGY.css
-%%WWWDIR%%/resources/OpenWeather-UWsD3Ken.js
-%%WWWDIR%%/resources/PaperlessNG-Dr2jVcHs.js
-%%WWWDIR%%/resources/PeaNUT-C28MUCr8.js
+%%WWWDIR%%/resources/OpenWeather-BabLKX1b.js
+%%WWWDIR%%/resources/OpenWeather-CGFhy5zp.css
+%%WWWDIR%%/resources/PaperlessNG-oWfRjp9q.js
+%%WWWDIR%%/resources/PeaNUT-BgH2df17.js
%%WWWDIR%%/resources/PiAlert-27f4aoYp.css
-%%WWWDIR%%/resources/PiAlert-DmtXo46V.js
-%%WWWDIR%%/resources/PiHole-3sFywXPg.css
-%%WWWDIR%%/resources/PiHole-CewW1sJ8.js
+%%WWWDIR%%/resources/PiAlert-DQIOdNw5.js
+%%WWWDIR%%/resources/PiHole-B590p74K.css
+%%WWWDIR%%/resources/PiHole-CYpoxC7G.js
%%WWWDIR%%/resources/Ping-BVyk1tW9.css
-%%WWWDIR%%/resources/Ping-CDn56lAz.js
-%%WWWDIR%%/resources/Plex-CtqAc55C.css
-%%WWWDIR%%/resources/Plex-U4yR0ZN3.js
+%%WWWDIR%%/resources/Ping-fi6Ns6kR.js
+%%WWWDIR%%/resources/Plex-CYMU8-Xj.js
+%%WWWDIR%%/resources/Plex-D9cFNqvv.css
%%WWWDIR%%/resources/Portainer-BQaRgpcO.css
-%%WWWDIR%%/resources/Portainer-BrAttM5X.js
-%%WWWDIR%%/resources/Prometheus-BvsyBoCa.js
+%%WWWDIR%%/resources/Portainer-CIbatA6O.js
+%%WWWDIR%%/resources/Prometheus-BpnOLe8b.js
%%WWWDIR%%/resources/Prometheus-DW7rR0zJ.css
%%WWWDIR%%/resources/Prowlarr-C0MntQnn.css
-%%WWWDIR%%/resources/Prowlarr-D0o-_4lR.js
+%%WWWDIR%%/resources/Prowlarr-DxxcG7yf.js
%%WWWDIR%%/resources/Proxmox-B7Ne6yNU.css
-%%WWWDIR%%/resources/Proxmox-CXr0bID6.js
-%%WWWDIR%%/resources/Radarr-DGpUY4mN.js
+%%WWWDIR%%/resources/Proxmox-BdtgVaPM.js
+%%WWWDIR%%/resources/Radarr-CGR3qyQt.js
%%WWWDIR%%/resources/Radarr-Drh5L8HP.css
-%%WWWDIR%%/resources/Readarr-DtScEyIt.js
+%%WWWDIR%%/resources/Readarr-D-hglqIL.js
%%WWWDIR%%/resources/Readarr-QGnLos4n.css
%%WWWDIR%%/resources/Rtorrent-8y0Hk3ah.css
-%%WWWDIR%%/resources/Rtorrent-CVI1EAT2.js
-%%WWWDIR%%/resources/SABnzbd-Bq1E7sfL.js
-%%WWWDIR%%/resources/SABnzbd-C7_KSBXO.css
+%%WWWDIR%%/resources/Rtorrent-Br5Zwikh.js
+%%WWWDIR%%/resources/SABnzbd-8iUmv5zX.js
+%%WWWDIR%%/resources/SABnzbd-Doh_UVaM.css
%%WWWDIR%%/resources/Scrutiny-BFyhoSmH.css
-%%WWWDIR%%/resources/Scrutiny-N52Py8RU.js
+%%WWWDIR%%/resources/Scrutiny-NK54uZOt.js
%%WWWDIR%%/resources/Sonarr-B0qW27KC.css
-%%WWWDIR%%/resources/Sonarr-CF-5Hk9N.js
-%%WWWDIR%%/resources/SpeedtestTracker-CYrwstzE.js
+%%WWWDIR%%/resources/Sonarr-CutaVloJ.js
+%%WWWDIR%%/resources/SpeedtestTracker-WmpXDxlz.js
+%%WWWDIR%%/resources/Tautulli-B81_2SB0.js
%%WWWDIR%%/resources/Tautulli-CfeJITWv.css
-%%WWWDIR%%/resources/Tautulli-CmYOkCJF.js
%%WWWDIR%%/resources/Tdarr-BvRK51o8.css
-%%WWWDIR%%/resources/Tdarr-ZSMoTlRe.js
+%%WWWDIR%%/resources/Tdarr-DcPzSkDN.js
%%WWWDIR%%/resources/ThemeChooser-CcNjZIAP.css
-%%WWWDIR%%/resources/ThemeChooser-UvSE6ows.js
-%%WWWDIR%%/resources/Traefik-CFx7BitS.js
+%%WWWDIR%%/resources/ThemeChooser-KKiR7zA_.js
+%%WWWDIR%%/resources/Traefik-BwTNK5Rs.js
%%WWWDIR%%/resources/Traefik-QfL0WZ4b.css
-%%WWWDIR%%/resources/TruenasScale-Dlh3PNum.js
+%%WWWDIR%%/resources/TruenasScale-BnAlcXxz.js
%%WWWDIR%%/resources/TruenasScale-maMPkiom.css
-%%WWWDIR%%/resources/UptimeKuma-CcWwR8ZM.js
+%%WWWDIR%%/resources/UptimeKuma-BFp0iigK.js
%%WWWDIR%%/resources/UptimeKuma-Fq8eQnsp.css
-%%WWWDIR%%/resources/Vaultwarden-DTS3MIuR.js
+%%WWWDIR%%/resources/Vaultwarden-CH7Xt_PN.js
%%WWWDIR%%/resources/Vaultwarden-Dy-eliI8.css
%%WWWDIR%%/resources/WUD-BLIHvfpt.css
-%%WWWDIR%%/resources/WUD-dvk-H_mn.js
-%%WWWDIR%%/resources/Wallabag-BgScaCez.js
+%%WWWDIR%%/resources/WUD-BQz1SsPh.js
+%%WWWDIR%%/resources/Wallabag-CD96f6ec.js
%%WWWDIR%%/resources/Wallabag-VA4tCsKR.css
%%WWWDIR%%/resources/fa-brands-400-D1LuMI3I.ttf
%%WWWDIR%%/resources/fa-brands-400-D_cYUPeE.woff2
@@ -121,11 +121,10 @@
%%WWWDIR%%/resources/fa-solid-900-D0aA9rwL.ttf
%%WWWDIR%%/resources/fa-v4compatibility-C9RhG_FT.woff2
%%WWWDIR%%/resources/fa-v4compatibility-CCth-dXg.ttf
-%%WWWDIR%%/resources/index-CszYxh3i.css
-%%WWWDIR%%/resources/index-D-u-9ayF.js
+%%WWWDIR%%/resources/index-CgyetKj3.css
+%%WWWDIR%%/resources/index-NXnxvJjD.js
%%WWWDIR%%/resources/noto-latin-normal-GUnxZaaT.woff2
+%%WWWDIR%%/resources/qBittorrent-B6NJkixf.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/hs-DAV/Makefile b/www/hs-DAV/Makefile
index f39bd3ad1b86..65266e6ae3ba 100644
--- a/www/hs-DAV/Makefile
+++ b/www/hs-DAV/Makefile
@@ -1,6 +1,6 @@
PORTNAME= DAV
PORTVERSION= 1.3.4
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www haskell
MAINTAINER= haskell@FreeBSD.org
@@ -11,127 +11,130 @@ LICENSE= GPLv3
USES= cabal
-USE_CABAL= OneTuple-0.4.1.1_1 \
- QuickCheck-2.14.3 \
+USE_CABAL= OneTuple-0.4.2_1 \
+ QuickCheck-2.15.0.1_1 \
StateVar-1.2.2 \
- adjunctions-4.4.2_2 \
- aeson-2.2.1.0_1 \
- ansi-terminal-1.1 \
+ adjunctions-4.4.3 \
+ aeson-2.2.3.0_3 \
+ ansi-terminal-1.1.2 \
ansi-terminal-types-1.1 \
appar-0.1.8 \
asn1-encoding-0.9.6_2 \
asn1-parse-0.9.5 \
asn1-types-0.3.4 \
- assoc-1.1_1 \
- async-2.2.5 \
- attoparsec-0.14.4_5 \
- base-orphans-0.9.1 \
+ assoc-1.1.1_1 \
+ async-2.2.5_3 \
+ attoparsec-0.14.4_6 \
+ base-orphans-0.9.3 \
base16-bytestring-1.0.2.0_1 \
base64-bytestring-1.2.1.0_1 \
basement-0.0.16 \
- bifunctors-5.6.1_2 \
- bitvec-1.1.5.0 \
+ bifunctors-5.6.2_2 \
+ bitvec-1.1.5.0_3 \
blaze-builder-0.4.2.3 \
- blaze-html-0.9.1.2_4 \
- blaze-markup-0.8.3.0_1 \
+ blaze-html-0.9.2.0_1 \
+ blaze-markup-0.8.3.0_2 \
byteorder-1.0.4 \
- cabal-doctest-1.0.9_3 \
+ cabal-doctest-1.0.11 \
call-stack-0.4.0 \
case-insensitive-1.2.1.0 \
- cborg-0.2.10.0 \
+ cborg-0.2.10.0_2 \
cereal-0.5.8.3 \
+ character-ps-0.1 \
colour-2.3.6 \
- comonad-5.0.8_2 \
- conduit-1.3.5 \
- conduit-extra-1.3.6 \
+ comonad-5.0.9_1 \
+ conduit-1.3.6.1 \
+ conduit-extra-1.3.7 \
contravariant-1.5.5 \
- cookie-0.4.6 \
- crypton-0.34 \
- crypton-connection-0.3.2 \
- crypton-x509-1.7.6_1 \
- crypton-x509-store-1.6.9 \
+ cookie-0.5.1 \
+ crypton-1.0.4 \
+ crypton-connection-0.4.4 \
+ crypton-x509-1.7.7 \
+ crypton-x509-store-1.6.10 \
crypton-x509-system-1.6.7 \
- crypton-x509-validation-1.6.12 \
- data-default-0.7.1.1 \
- data-default-class-0.1.2.0 \
- data-default-instances-containers-0.0.1 \
- data-default-instances-dlist-0.0.1 \
- data-default-instances-old-locale-0.0.1 \
- data-fix-0.3.2_5 \
+ 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 \
distributive-0.6.2.1_1 \
- dlist-1.0_1 \
+ dlist-1.0_2 \
+ ech-config-0.0.1 \
file-embed-0.0.16.0 \
- free-5.2_3 \
- generically-0.1.1_2 \
- half-0.3.1_1 \
- hashable-1.4.3.0_1 \
- hourglass-0.2.12 \
- hsc2hs-0.68.10_1 \
- http-client-0.7.16 \
- http-client-tls-0.3.6.3 \
+ free-5.2_7 \
+ generically-0.1.1_4 \
+ half-0.3.2 \
+ hashable-1.5.0.0_1 \
+ hourglass-0.2.12_1 \
+ hpke-0.0.0 \
+ hsc2hs-0.68.10_4 \
+ http-client-0.7.19 \
+ http-client-tls-0.3.6.4_2 \
http-types-0.12.4 \
- indexed-traversable-0.1.3 \
- indexed-traversable-instances-0.1.1.2_2 \
- integer-conversion-0.1.0.1_1 \
- integer-logarithms-1.0.3.1_5 \
- invariant-0.6.2_1 \
- iproute-1.7.12 \
- kan-extensions-5.2.5_2 \
- lens-5.2.3_2 \
- memory-0.18.0 \
+ indexed-traversable-0.1.4_1 \
+ indexed-traversable-instances-0.1.2_1 \
+ integer-conversion-0.1.1_1 \
+ integer-logarithms-1.0.4 \
+ invariant-0.6.4_1 \
+ iproute-1.7.15 \
+ kan-extensions-5.2.6_1 \
+ lens-5.3.4 \
+ memory-0.18.0_1 \
mime-types-0.1.2.0 \
- mono-traversable-1.0.17.0 \
- network-3.1.4.0_1 \
+ mono-traversable-1.0.21.0 \
+ 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 \
- optparse-applicative-0.18.1.0 \
- parallel-3.2.2.0_7 \
+ optparse-applicative-0.18.1.0_1 \
+ os-string-2.0.7 \
+ parallel-3.2.2.0_9 \
pem-0.2.4 \
prettyprinter-1.7.1 \
prettyprinter-ansi-terminal-1.1.3 \
- primitive-0.9.0.0 \
+ primitive-0.9.1.0 \
profunctors-5.6.2_3 \
- random-1.2.1.2 \
- reflection-2.1.7_1 \
+ random-1.3.1 \
+ reflection-2.1.9_1 \
resourcet-1.3.0 \
- 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 \
semigroups-0.20 \
- serialise-0.2.6.1_1 \
+ serialise-0.2.6.1_4 \
shakespeare-2.1.0.1 \
socks-0.6.1 \
split-0.2.5 \
- splitmix-0.1.0.5 \
- streaming-commons-0.2.2.6_1 \
- strict-0.5_1 \
- tagged-0.8.8 \
- text-iso8601-0.1_1 \
- text-short-0.1.5_3 \
- th-abstraction-0.6.0.0_1 \
- th-compat-0.1.4_4 \
- th-lift-0.8.4 \
- these-1.2_1 \
- time-compat-1.9.6.1_6 \
- tls-2.0.1 \
+ splitmix-0.1.1 \
+ streaming-commons-0.2.3.0 \
+ strict-0.5.1_1 \
+ tagged-0.8.9 \
+ tasty-1.5.3_1 \
+ text-iso8601-0.1.1_2 \
+ text-short-0.1.6_3 \
+ th-abstraction-0.7.1.0_1 \
+ th-compat-0.1.6 \
+ th-lift-0.8.6 \
+ these-1.2.1_2 \
+ time-compat-1.9.8 \
+ tls-2.1.9 \
transformers-base-0.4.6 \
transformers-compat-0.7.2 \
- typed-process-0.2.11.1 \
- unix-time-0.4.12 \
- unliftio-core-0.2.1.0_3 \
- unordered-containers-0.2.20_1 \
+ typed-process-0.2.13.0 \
+ unix-time-0.4.16 \
+ unliftio-core-0.2.1.0_4 \
+ unordered-containers-0.2.20_4 \
utf8-string-1.0.2 \
- uuid-types-1.0.5.1 \
- vector-0.13.1.0 \
- vector-algorithms-0.9.0.1_3 \
- vector-stream-0.1.0.1 \
+ uuid-types-1.0.6_3 \
+ vector-0.13.2.0_1 \
+ vector-algorithms-0.9.1.0 \
+ vector-stream-0.1.0.1_3 \
void-0.7.3 \
- witherable-0.4.2_4 \
- xml-conduit-1.9.1.3 \
+ witherable-0.5_1 \
+ xml-conduit-1.10.0.0 \
xml-hamlet-0.5.0.2 \
xml-types-0.3.8 \
- zlib-0.7.0.0
+ zlib-0.7.1.0_2
CABAL_EXECUTABLES= hdav
diff --git a/www/hs-DAV/distinfo b/www/hs-DAV/distinfo
index 854e4fcb56e7..8507c518ba1f 100644
--- a/www/hs-DAV/distinfo
+++ b/www/hs-DAV/distinfo
@@ -1,24 +1,24 @@
-TIMESTAMP = 1709138755
+TIMESTAMP = 1747068459
SHA256 (cabal/DAV-1.3.4/DAV-1.3.4.tar.gz) = 5e3b825290a0bd4c9da1c814b5e67901b0f9f1d16a88effaa7e060a81c895bc7
SIZE (cabal/DAV-1.3.4/DAV-1.3.4.tar.gz) = 19884
-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
-SIZE (cabal/OneTuple-0.4.1.1/revision/1.cabal) = 2575
-SHA256 (cabal/QuickCheck-2.14.3/QuickCheck-2.14.3.tar.gz) = 5c0f22b36b28a1a8fa110b3819818d3f29494a3b0dedbae299f064123ca70501
-SIZE (cabal/QuickCheck-2.14.3/QuickCheck-2.14.3.tar.gz) = 76849
+SHA256 (cabal/OneTuple-0.4.2/OneTuple-0.4.2.tar.gz) = 174da8a0f4004d17b08182cb25b0e045fce5de1fdeae84e9d75fdea2867aab55
+SIZE (cabal/OneTuple-0.4.2/OneTuple-0.4.2.tar.gz) = 5207
+SHA256 (cabal/OneTuple-0.4.2/revision/1.cabal) = dd7266f983da2970e5662168add810dabadabb3a4bb9b137181eafc0ac7ea4d4
+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/adjunctions-4.4.2/adjunctions-4.4.2.tar.gz) = 147b5f8db810bca0ea8952ef974982ffc447cecd21f01e1ea1121df77e276518
-SIZE (cabal/adjunctions-4.4.2/adjunctions-4.4.2.tar.gz) = 17201
-SHA256 (cabal/adjunctions-4.4.2/revision/2.cabal) = 30206ae6b78d3d523c2ff73640f84b51fa204ac3f05267a5f0c77c486b96781d
-SIZE (cabal/adjunctions-4.4.2/revision/2.cabal) = 3379
-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/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/adjunctions-4.4.3/adjunctions-4.4.3.tar.gz) = 8beb121cee2bf913dac3188ed1e0e05cf1a0d0f12d4cb4a27c0da58450eb189a
+SIZE (cabal/adjunctions-4.4.3/adjunctions-4.4.3.tar.gz) = 16788
+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.2/ansi-terminal-1.1.2.tar.gz) = a8d04a3e0451e22a6499a92311f0df1196dc65b687df7d10e3f30d92420156b0
+SIZE (cabal/ansi-terminal-1.1.2/ansi-terminal-1.1.2.tar.gz) = 36259
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/appar-0.1.8/appar-0.1.8.tar.gz) = c4ceeddc26525b58d82c41b6d3e32141371a200a6794aae185b6266ccc81631f
@@ -31,18 +31,20 @@ SHA256 (cabal/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz) = 8f1fe1344d30b39dc594d7
SIZE (cabal/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz) = 2951
SHA256 (cabal/asn1-types-0.3.4/asn1-types-0.3.4.tar.gz) = 78ee92a251379298ca820fa53edbf4b33c539b9fcd887c86f520c30e3b4e21a8
SIZE (cabal/asn1-types-0.3.4/asn1-types-0.3.4.tar.gz) = 6472
-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/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/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/3.cabal) = b7648c6165729a973d95cb328f9fd874813a81c727707e8b2552b4f03399763b
+SIZE (cabal/async-2.2.5/revision/3.cabal) = 3366
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/5.cabal) = ec709539b881d6431620bd7c40fbfa680aaf4a98c6f35b51536d8f455682b1ae
-SIZE (cabal/attoparsec-0.14.4/revision/5.cabal) = 5703
-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/attoparsec-0.14.4/revision/6.cabal) = 35129d0ab1741f000f1a7d2fc839544919ee6fbb8f2d6e7f0a629c41f91035f3
+SIZE (cabal/attoparsec-0.14.4/revision/6.cabal) = 5914
+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
@@ -53,154 +55,156 @@ 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/basement-0.0.16/basement-0.0.16.tar.gz) = 7fb77e249aef76ba5aed3059d556800ce02b614597c488ba01f0a16449146300
SIZE (cabal/basement-0.0.16/basement-0.0.16.tar.gz) = 134837
-SHA256 (cabal/bifunctors-5.6.1/bifunctors-5.6.1.tar.gz) = 06381471b5be16516a1b2c4b21a5101a3d991038bface8e0cad144c0044d57fc
-SIZE (cabal/bifunctors-5.6.1/bifunctors-5.6.1.tar.gz) = 38170
-SHA256 (cabal/bifunctors-5.6.1/revision/2.cabal) = 82fa7ed8f69f0bfa375de117ab36414c0b96a97ee046edc3ac6da7a295a94755
-SIZE (cabal/bifunctors-5.6.1/revision/2.cabal) = 3273
+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/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/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.1.2/blaze-html-0.9.1.2.tar.gz) = 60503f42546c6c1b954014d188ea137e43d74dcffd2bf6157c113fd91a0c394c
-SIZE (cabal/blaze-html-0.9.1.2/blaze-html-0.9.1.2.tar.gz) = 81617
-SHA256 (cabal/blaze-html-0.9.1.2/revision/4.cabal) = 2e40ad3828320b72122f09754091fb686fa0fd4c083769f17ef84584972ec450
-SIZE (cabal/blaze-html-0.9.1.2/revision/4.cabal) = 3020
+SHA256 (cabal/blaze-html-0.9.2.0/blaze-html-0.9.2.0.tar.gz) = 65542ef39f7644a3d76afcadeb976d3e334c6947516b7313fcb59165cea1608f
+SIZE (cabal/blaze-html-0.9.2.0/blaze-html-0.9.2.0.tar.gz) = 81915
+SHA256 (cabal/blaze-html-0.9.2.0/revision/1.cabal) = 85c42f84f4ead2c48844fbe0865069add3bb3bb3322d38607e93d5515a4c9c58
+SIZE (cabal/blaze-html-0.9.2.0/revision/1.cabal) = 3087
SHA256 (cabal/blaze-markup-0.8.3.0/blaze-markup-0.8.3.0.tar.gz) = 8606ac8b4a1f7f8f1bbc0770b2752e9b6f88ccc9fbdcbb33aa20577d0e5930e8
SIZE (cabal/blaze-markup-0.8.3.0/blaze-markup-0.8.3.0.tar.gz) = 14647
-SHA256 (cabal/blaze-markup-0.8.3.0/revision/1.cabal) = a8365ac8b98738065c2867682dbcd9b0baeb7a5cd1eaa8e508279edfd19227b9
-SIZE (cabal/blaze-markup-0.8.3.0/revision/1.cabal) = 2276
+SHA256 (cabal/blaze-markup-0.8.3.0/revision/2.cabal) = 027f218b81d28a7c0a33b93d456c4e5aa92d145e9dcee14834fbad73a39ad7e4
+SIZE (cabal/blaze-markup-0.8.3.0/revision/2.cabal) = 2360
SHA256 (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919
SIZE (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = 2030
-SHA256 (cabal/cabal-doctest-1.0.9/cabal-doctest-1.0.9.tar.gz) = 5556088496111d33810c4ae6c4a065bb37fa3315e9e8891e8000b1ab6707ba73
-SIZE (cabal/cabal-doctest-1.0.9/cabal-doctest-1.0.9.tar.gz) = 10770
-SHA256 (cabal/cabal-doctest-1.0.9/revision/3.cabal) = 6dea0dbd1457f43d96ce1cfb1bab8b9f55d4fb82940e2bfa5aad78e6e2260656
-SIZE (cabal/cabal-doctest-1.0.9/revision/3.cabal) = 1517
+SHA256 (cabal/cabal-doctest-1.0.11/cabal-doctest-1.0.11.tar.gz) = dc2df2f0b427028617f10e445ff8ab3352d3bbeef1b8dd847e879d2d36bf923f
+SIZE (cabal/cabal-doctest-1.0.11/cabal-doctest-1.0.11.tar.gz) = 13204
SHA256 (cabal/call-stack-0.4.0/call-stack-0.4.0.tar.gz) = 430bcf8a3404f7e55319573c0b807b1356946f0c8f289bb3d9afb279c636b87b
SIZE (cabal/call-stack-0.4.0/call-stack-0.4.0.tar.gz) = 2757
SHA256 (cabal/case-insensitive-1.2.1.0/case-insensitive-1.2.1.0.tar.gz) = 296dc17e0c5f3dfb3d82ced83e4c9c44c338ecde749b278b6eae512f1d04e406
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/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
+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
-SIZE (cabal/comonad-5.0.8/comonad-5.0.8.tar.gz) = 15227
-SHA256 (cabal/comonad-5.0.8/revision/2.cabal) = 4a4dbfbd03fb4963987710fca994e8b5624bd05a33e5f95b7581b26f8229c5e3
-SIZE (cabal/comonad-5.0.8/revision/2.cabal) = 3631
-SHA256 (cabal/conduit-1.3.5/conduit-1.3.5.tar.gz) = 2bb0d3e0eecc43e3d1d8cfc2125914f9175cde752be2d5908a1e120f321c782d
-SIZE (cabal/conduit-1.3.5/conduit-1.3.5.tar.gz) = 88893
-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/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/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-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.4.6/cookie-0.4.6.tar.gz) = 8c41a956c32b9733d525a53d43b0338a236a34d36658ecc4364c8249a6664baa
-SIZE (cabal/cookie-0.4.6/cookie-0.4.6.tar.gz) = 6219
-SHA256 (cabal/crypton-0.34/crypton-0.34.tar.gz) = 4444846924ca55615fce104913a5a68675a180cfeadc350ab2b124fba1bc1ed6
-SIZE (cabal/crypton-0.34/crypton-0.34.tar.gz) = 622533
-SHA256 (cabal/crypton-connection-0.3.2/crypton-connection-0.3.2.tar.gz) = 208be23bc910f8e5f9431995b9c011ed376bb947d79f74c8f51a5e4ecd9e991e
-SIZE (cabal/crypton-connection-0.3.2/crypton-connection-0.3.2.tar.gz) = 9054
-SHA256 (cabal/crypton-x509-1.7.6/crypton-x509-1.7.6.tar.gz) = ebb74aca2d00261e2fb4927d211ba1a174e190e5257f309e190f019727f8caff
-SIZE (cabal/crypton-x509-1.7.6/crypton-x509-1.7.6.tar.gz) = 21557
-SHA256 (cabal/crypton-x509-1.7.6/revision/1.cabal) = c567657a705b6d6521f9dd2de999bf530d618ec00f3b939df76a41fb0fe94281
-SIZE (cabal/crypton-x509-1.7.6/revision/1.cabal) = 2339
-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/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/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-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.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.12/crypton-x509-validation-1.6.12.tar.gz) = 0e60b7e237a4fd5e7e6e7200018c7947314292ef63751cbb51877836ebe650f6
-SIZE (cabal/crypton-x509-validation-1.6.12/crypton-x509-validation-1.6.12.tar.gz) = 19573
-SHA256 (cabal/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz) = b0f95d279cd75cacaa8152a01590dc3460f7134f6840b37052abb3ba3cb2a511
-SIZE (cabal/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz) = 1627
-SHA256 (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
-SIZE (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 2522
-SHA256 (cabal/data-default-instances-containers-0.0.1/data-default-instances-containers-0.0.1.tar.gz) = a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a
-SIZE (cabal/data-default-instances-containers-0.0.1/data-default-instances-containers-0.0.1.tar.gz) = 1659
-SHA256 (cabal/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz) = 7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959
-SIZE (cabal/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz) = 1503
-SHA256 (cabal/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz) = 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802
-SIZE (cabal/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
-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/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
+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
SIZE (cabal/distributive-0.6.2.1/revision/1.cabal) = 2996
SHA256 (cabal/dlist-1.0/dlist-1.0.tar.gz) = 173d637328bb173fcc365f30d29ff4a94292a1e0e5558aeb3dfc11de81510115
SIZE (cabal/dlist-1.0/dlist-1.0.tar.gz) = 18667
-SHA256 (cabal/dlist-1.0/revision/1.cabal) = 55ff69d20ce638fc7727342ee67f2f868da61d3dcf3763f790bf9aa0b145e568
-SIZE (cabal/dlist-1.0/revision/1.cabal) = 3812
+SHA256 (cabal/dlist-1.0/revision/2.cabal) = 854727594c5a816ab3d10f15b1bc4fedaf9e3f7d1ef517a2bb9011f29ba261d2
+SIZE (cabal/dlist-1.0/revision/2.cabal) = 3942
+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/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/free-5.2/free-5.2.tar.gz) = 72867f7c89173263765736e8d395e94291f1aaea626ecb1d673d72ce90b94f89
SIZE (cabal/free-5.2/free-5.2.tar.gz) = 58781
-SHA256 (cabal/free-5.2/revision/3.cabal) = 4dd76c1a19f81d7866e7b75682350f1ef3e0441b19b4d07eccdd9ef326a0be70
-SIZE (cabal/free-5.2/revision/3.cabal) = 4176
+SHA256 (cabal/free-5.2/revision/7.cabal) = 7f3992a66987bbba5a6546420f6129fb9b66b80cdd005d34ec77a1e1c8ed8340
+SIZE (cabal/free-5.2/revision/7.cabal) = 4178
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/2.cabal) = 378ec049bc2853b8011df116647fbd34bb9f00edce9840e4957f98abc097597c
-SIZE (cabal/generically-0.1.1/revision/2.cabal) = 1169
-SHA256 (cabal/half-0.3.1/half-0.3.1.tar.gz) = e2afc32724e11bf5c695d797b9169d9d9b2dc62a530aed31284c8187af1615d1
-SIZE (cabal/half-0.3.1/half-0.3.1.tar.gz) = 8514
-SHA256 (cabal/half-0.3.1/revision/1.cabal) = f43f16671b42bdc92b4be9e0b0ce1bcff817c928d0a50f13a6264a24586c1a7c
-SIZE (cabal/half-0.3.1/revision/1.cabal) = 2158
-SHA256 (cabal/hashable-1.4.3.0/hashable-1.4.3.0.tar.gz) = 32efb16c2891786209b7cbe5c39df9b3a9ae51e836f1a54f646bc4602b7ab0f5
-SIZE (cabal/hashable-1.4.3.0/hashable-1.4.3.0.tar.gz) = 25601
-SHA256 (cabal/hashable-1.4.3.0/revision/1.cabal) = f3bf68acfa0df7a064a378ef2cdcfeb55e6fb96100675f4c593556dcbf3d7194
-SIZE (cabal/hashable-1.4.3.0/revision/1.cabal) = 4718
+SHA256 (cabal/generically-0.1.1/revision/4.cabal) = 3f64278f5c582dd7c6963967b1290079bcd03b8348989f909ac9bd972ddc452e
+SIZE (cabal/generically-0.1.1/revision/4.cabal) = 1203
+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.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/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/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/1.cabal) = 488cca2a179a5141da8f35a3a7e6699a0ef690f834f589d6b152c4947aa8fe2d
-SIZE (cabal/hsc2hs-0.68.10/revision/1.cabal) = 3013
-SHA256 (cabal/http-client-0.7.16/http-client-0.7.16.tar.gz) = 3a84ca8f94306084aef3ff5128db231cb6bb7c606fbee16910f8d0df400c6291
-SIZE (cabal/http-client-0.7.16/http-client-0.7.16.tar.gz) = 96891
-SHA256 (cabal/http-client-tls-0.3.6.3/http-client-tls-0.3.6.3.tar.gz) = 38dcfc3d772eb6898b4a8856d6159824d13f65eb291733619f625a802dad9095
-SIZE (cabal/http-client-tls-0.3.6.3/http-client-tls-0.3.6.3.tar.gz) = 7935
+SHA256 (cabal/hsc2hs-0.68.10/revision/4.cabal) = 725ef6da03d3d6e332db4de0a35bee45d72e4d31decc5ec7f153e6837af5f03e
+SIZE (cabal/hsc2hs-0.68.10/revision/4.cabal) = 3114
+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-types-0.12.4/http-types-0.12.4.tar.gz) = 4d4b1bb0cc817e5fef0c9c76c9647f69f4d300c45a105043493eff86381be549
SIZE (cabal/http-types-0.12.4/http-types-0.12.4.tar.gz) = 18707
-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/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
-SIZE (cabal/integer-conversion-0.1.0.1/revision/1.cabal) = 2250
-SHA256 (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9b0a9f9fab609b15cd015865721fb05f744a1bc77ae92fd133872de528bbea7f
-SIZE (cabal/integer-logarithms-1.0.3.1/integer-logarithms-1.0.3.1.tar.gz) = 9023
-SHA256 (cabal/integer-logarithms-1.0.3.1/revision/5.cabal) = 4d0dfc334e64ff57bb1a08717afa4a4a7f28e4cdc46615dd287be31ef63ec00d
-SIZE (cabal/integer-logarithms-1.0.3.1/revision/5.cabal) = 3278
-SHA256 (cabal/invariant-0.6.2/invariant-0.6.2.tar.gz) = c36485e8088a57e9df1a93881211a1c09e8920ce1b14bfa141cac9f75b7ee108
-SIZE (cabal/invariant-0.6.2/invariant-0.6.2.tar.gz) = 28199
-SHA256 (cabal/invariant-0.6.2/revision/1.cabal) = 4338158fe36c3ff9ee741eeff79cb886222cab9da3f476071956cb01b0d9bbff
-SIZE (cabal/invariant-0.6.2/revision/1.cabal) = 3617
-SHA256 (cabal/iproute-1.7.12/iproute-1.7.12.tar.gz) = f1751d1579fcbc1d9f86d9d1c9ede48cb71cbeb1d7b2043491c6216e4f236b63
-SIZE (cabal/iproute-1.7.12/iproute-1.7.12.tar.gz) = 17864
-SHA256 (cabal/kan-extensions-5.2.5/kan-extensions-5.2.5.tar.gz) = b914dccc040caf1d8764b99df1028dad3e4fdf46c262192e54b59c9da66ead22
-SIZE (cabal/kan-extensions-5.2.5/kan-extensions-5.2.5.tar.gz) = 22205
-SHA256 (cabal/kan-extensions-5.2.5/revision/2.cabal) = fbdba767565f40faf515b044a774cc3b371eb6ce8a082d9f659411cea88698cf
-SIZE (cabal/kan-extensions-5.2.5/revision/2.cabal) = 3066
-SHA256 (cabal/lens-5.2.3/lens-5.2.3.tar.gz) = df1e8ca8dd89d884994e0c80761a972088326fa43ed5d47c01b14abb710b994d
-SIZE (cabal/lens-5.2.3/lens-5.2.3.tar.gz) = 703220
-SHA256 (cabal/lens-5.2.3/revision/2.cabal) = 637287c76adff383063b3206a4213640de1a74839ec16008cc71b5b407f7d05e
-SIZE (cabal/lens-5.2.3/revision/2.cabal) = 15237
+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.1/integer-conversion-0.1.1.tar.gz) = c18164a048073310f6353ebc64c9037b52a4b8299963ce05e027bcf60e22155a
+SIZE (cabal/integer-conversion-0.1.1/integer-conversion-0.1.1.tar.gz) = 6179
+SHA256 (cabal/integer-conversion-0.1.1/revision/1.cabal) = 941d4ae16e2124cbff5defe2abedb49efc8e03a594f817035bf231a317e6c1c9
+SIZE (cabal/integer-conversion-0.1.1/revision/1.cabal) = 2256
+SHA256 (cabal/integer-logarithms-1.0.4/integer-logarithms-1.0.4.tar.gz) = 6a93c76c2518cbe2d72ab17da6ae46d8cae93cbfb7c5a5ad5783f903c1448f45
+SIZE (cabal/integer-logarithms-1.0.4/integer-logarithms-1.0.4.tar.gz) = 8948
+SHA256 (cabal/invariant-0.6.4/invariant-0.6.4.tar.gz) = a9e2ab4ee3e0d4613beb7bda36a8ebc4f72318450514f4832d2fa43b74f0aeb3
+SIZE (cabal/invariant-0.6.4/invariant-0.6.4.tar.gz) = 27079
+SHA256 (cabal/invariant-0.6.4/revision/1.cabal) = 4a9a609f4e93ffed158b3b4f5a80822c6da30aa71a5370307c0c00c2d658d1c6
+SIZE (cabal/invariant-0.6.4/revision/1.cabal) = 3513
+SHA256 (cabal/iproute-1.7.15/iproute-1.7.15.tar.gz) = 18a331a7e0e6f9dc89a2da95577b0d76bd2690b8f832b72b46d6cc9b667b4ba5
+SIZE (cabal/iproute-1.7.15/iproute-1.7.15.tar.gz) = 18033
+SHA256 (cabal/kan-extensions-5.2.6/kan-extensions-5.2.6.tar.gz) = fa82283c1c9ac3dc0951b7ca9f5b2e6f13d8331c20154ebb222b509824eeeccc
+SIZE (cabal/kan-extensions-5.2.6/kan-extensions-5.2.6.tar.gz) = 21718
+SHA256 (cabal/kan-extensions-5.2.6/revision/1.cabal) = e0b972f900a3c04c0f36d7e221e6b04343a5a1f00ce3aababff7932e173f0833
+SIZE (cabal/kan-extensions-5.2.6/revision/1.cabal) = 2581
+SHA256 (cabal/lens-5.3.4/lens-5.3.4.tar.gz) = f1b6ed14b8d8ccafb5724929fb3d0d3b5866b923ca88e8c565b4a84b7993c88a
+SIZE (cabal/lens-5.3.4/lens-5.3.4.tar.gz) = 707015
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/memory-0.18.0/revision/1.cabal) = 9f4de967352f80b6f174c9a166f315393dde80b77d7b67e41268ae7dec0319f9
+SIZE (cabal/memory-0.18.0/revision/1.cabal) = 4581
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/mono-traversable-1.0.17.0/mono-traversable-1.0.17.0.tar.gz) = 25d8f9b860bc6335d3d213f3392ab58d4041e28127874ea18525412f184cd32f
-SIZE (cabal/mono-traversable-1.0.17.0/mono-traversable-1.0.17.0.tar.gz) = 42225
-SHA256 (cabal/network-3.1.4.0/network-3.1.4.0.tar.gz) = b452a2afac95d9207357eb3820c719c7c7d27871ef4b6ed7bfcd03a036b9158e
-SIZE (cabal/network-3.1.4.0/network-3.1.4.0.tar.gz) = 139988
-SHA256 (cabal/network-3.1.4.0/revision/1.cabal) = e152cdb03243afb52bbc740cfbe96905ca298a6f6342f0c47b3f2e227ff19def
-SIZE (cabal/network-3.1.4.0/revision/1.cabal) = 5208
+SHA256 (cabal/mono-traversable-1.0.21.0/mono-traversable-1.0.21.0.tar.gz) = 4dd93ea334c0169500402f07aa39c98dbb7bffe55dc63fdf228da2cc22c7c5cd
+SIZE (cabal/mono-traversable-1.0.21.0/mono-traversable-1.0.21.0.tar.gz) = 43552
+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
@@ -213,133 +217,141 @@ SHA256 (cabal/old-time-1.1.0.4/old-time-1.1.0.4.tar.gz) = 1e22eb7f7b924a676f52e3
SIZE (cabal/old-time-1.1.0.4/old-time-1.1.0.4.tar.gz) = 75542
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/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/parallel-3.2.2.0/parallel-3.2.2.0.tar.gz) = 170453a71a2a8b31cca63125533f7771d7debeb639700bdabdd779c34d8a6ef6
SIZE (cabal/parallel-3.2.2.0/parallel-3.2.2.0.tar.gz) = 14681
-SHA256 (cabal/parallel-3.2.2.0/revision/7.cabal) = b993406e98fe9126eff4a69d28e7e361037dd1c0892a9fd6c26e1f92eb9c4fa4
-SIZE (cabal/parallel-3.2.2.0/revision/7.cabal) = 1926
+SHA256 (cabal/parallel-3.2.2.0/revision/9.cabal) = 9d7b34ac537940f67732eca31d48a43bd78fb65a91baebddf63bee4fc3813d81
+SIZE (cabal/parallel-3.2.2.0/revision/9.cabal) = 1961
SHA256 (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 770c4c1b9cd24b3db7f511f8a48404a0d098999e28573c3743a8a296bb96f8d4
SIZE (cabal/pem-0.2.4/pem-0.2.4.tar.gz) = 4717
SHA256 (cabal/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 5e6ea6903114fa118fcc359633dfb7ecddecb92c06c853d02a77b72b251f0b45
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.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/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 65955d7b50525a4a3bccdab1d982d2ae342897fd38140d5a94b5ef3800d8c92a
SIZE (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 28522
SHA256 (cabal/profunctors-5.6.2/revision/3.cabal) = e178ba4468982326656626e2089e296f64485e68fdddc9f4476dcd5d612b4f78
SIZE (cabal/profunctors-5.6.2/revision/3.cabal) = 2484
-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/reflection-2.1.7/reflection-2.1.7.tar.gz) = 6cbb18a8b02871533bb8b641dc6f76813a097d94404e5808bb5d52b0f0e415fd
-SIZE (cabal/reflection-2.1.7/reflection-2.1.7.tar.gz) = 17823
-SHA256 (cabal/reflection-2.1.7/revision/1.cabal) = f2b5b3f0983a605d16e53af489ebba62967d2c80353473ca66cc1734222b3a04
-SIZE (cabal/reflection-2.1.7/revision/1.cabal) = 4518
+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/reflection-2.1.9/reflection-2.1.9.tar.gz) = c6a7d5e41ad0ee1a05c660acf4fd34b21f38330eec165d246b7fffb398e59fb3
+SIZE (cabal/reflection-2.1.9/reflection-2.1.9.tar.gz) = 17560
+SHA256 (cabal/reflection-2.1.9/revision/1.cabal) = eaf28dc9884718a306ed1e0c215a24b36c68b8aa3be425617f66d886d43fe1e0
+SIZE (cabal/reflection-2.1.9/revision/1.cabal) = 4171
SHA256 (cabal/resourcet-1.3.0/resourcet-1.3.0.tar.gz) = ec601785ee42a201f32adb205b8685c983f18757b1bd33d2e806d571e0f9996b
SIZE (cabal/resourcet-1.3.0/resourcet-1.3.0.tar.gz) = 17620
-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/semigroups-0.20/semigroups-0.20.tar.gz) = 902d2e33c96b40a89de5957f2a9e097197afcc35e257e45b32ebe770993673e1
SIZE (cabal/semigroups-0.20/semigroups-0.20.tar.gz) = 18788
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/1.cabal) = 48e55f150c7e3bac9003adeb49fcd4573814780c374c494a46ffccc2b2043df8
-SIZE (cabal/serialise-0.2.6.1/revision/1.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/shakespeare-2.1.0.1/shakespeare-2.1.0.1.tar.gz) = 6cb655f3734de1b920faf67f313d45e31fc7f8fcf0a2e00a45f986d8e107d22f
SIZE (cabal/shakespeare-2.1.0.1/shakespeare-2.1.0.1.tar.gz) = 71698
SHA256 (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 734447558bb061ce768f53a0df1f2401902c6bee396cc96ce627edd986ef6a73
SIZE (cabal/socks-0.6.1/socks-0.6.1.tar.gz) = 9759
SHA256 (cabal/split-0.2.5/split-0.2.5.tar.gz) = 52da404e8397c1ab238354c8d4fd9a7e9c5cac8849cc2ce2e45facc85e74a913
SIZE (cabal/split-0.2.5/split-0.2.5.tar.gz) = 16008
-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/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/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/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/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
-SIZE (cabal/th-abstraction-0.6.0.0/revision/1.cabal) = 2303
-SHA256 (cabal/th-compat-0.1.4/th-compat-0.1.4.tar.gz) = d8f97ac14ab47b6b8a7b0fdb4ff95426322ec56badd01652ac15da4a44d4bab8
-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/th-lift-0.8.4/th-lift-0.8.4.tar.gz) = f9c577238d4ba65fe3e78bc77f0cca54f17d02c0f6075b2487da5c63bdb4a61b
-SIZE (cabal/th-lift-0.8.4/th-lift-0.8.4.tar.gz) = 14711
-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/tls-2.0.1/tls-2.0.1.tar.gz) = 98658cb0394a9cd08c56c5fe11a6c96f16c892a2a594db421cd72e0e7f7be684
-SIZE (cabal/tls-2.0.1/tls-2.0.1.tar.gz) = 162814
+SHA256 (cabal/splitmix-0.1.1/splitmix-0.1.1.tar.gz) = d678c41a603a62032cf7e5f8336bb8222c93990e4b59c8b291b7ca26c7eb12c7
+SIZE (cabal/splitmix-0.1.1/splitmix-0.1.1.tar.gz) = 21981
+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/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/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/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.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-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/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/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.11.1/typed-process-0.2.11.1.tar.gz) = d5c5dda091d61bac35de4ed6d9ddb530e4eb2564ca3c0b93e577762b63d94148
-SIZE (cabal/typed-process-0.2.11.1/typed-process-0.2.11.1.tar.gz) = 18339
-SHA256 (cabal/unix-time-0.4.12/unix-time-0.4.12.tar.gz) = 50a57298e5cba81e9db2be9f4c24c7e514af96e541a97df05a5ecd411aaf97e2
-SIZE (cabal/unix-time-0.4.12/unix-time-0.4.12.tar.gz) = 52410
+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-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-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/3.cabal) = 28800633b20e0f7bfbdda1248c28022749aa0935aea10b1e3fc9c88cbebb06de
-SIZE (cabal/unliftio-core-0.2.1.0/revision/3.cabal) = 1004
+SHA256 (cabal/unliftio-core-0.2.1.0/revision/4.cabal) = f6a2736f858b5390d9384dca43d3ea4d96e9ca17217791791ca4951ba6e8072a
+SIZE (cabal/unliftio-core-0.2.1.0/revision/4.cabal) = 996
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/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.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/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-algorithms-0.9.0.1/vector-algorithms-0.9.0.1.tar.gz) = 2ba7c0d3a8f26ef3ada24ff4abe81609225ecbab3b5754f048f8a0a3ecc33841
-SIZE (cabal/vector-algorithms-0.9.0.1/vector-algorithms-0.9.0.1.tar.gz) = 29149
-SHA256 (cabal/vector-algorithms-0.9.0.1/revision/3.cabal) = 222b01a4c0b9e13d73d04fba7c65930df16d1647acc07d84c47ef0356fa33dba
-SIZE (cabal/vector-algorithms-0.9.0.1/revision/3.cabal) = 3880
+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.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-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
+SIZE (cabal/vector-stream-0.1.0.1/revision/3.cabal) = 1642
SHA256 (cabal/void-0.7.3/void-0.7.3.tar.gz) = 53af758ddc37dc63981671e503438d02c6f64a2d8744e9bec557a894431f7317
SIZE (cabal/void-0.7.3/void-0.7.3.tar.gz) = 6741
-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/xml-conduit-1.9.1.3/xml-conduit-1.9.1.3.tar.gz) = d8e9169562c71c9e6bc616f15832f521a68c362aa4fc03682748a809755f1bf4
-SIZE (cabal/xml-conduit-1.9.1.3/xml-conduit-1.9.1.3.tar.gz) = 44653
+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/xml-conduit-1.10.0.0/xml-conduit-1.10.0.0.tar.gz) = 3f9bd0cc3e80e49f2ac2a65b975ef503ea633f495172f9c05bdf1b46b5e1de92
+SIZE (cabal/xml-conduit-1.10.0.0/xml-conduit-1.10.0.0.tar.gz) = 44893
SHA256 (cabal/xml-hamlet-0.5.0.2/xml-hamlet-0.5.0.2.tar.gz) = 5ff04a927718f333689c5cdfde8ee3049533d0734e6a0d8026a71961c2642e81
SIZE (cabal/xml-hamlet-0.5.0.2/xml-hamlet-0.5.0.2.tar.gz) = 9328
SHA256 (cabal/xml-types-0.3.8/xml-types-0.3.8.tar.gz) = dad5e4ce602b7d1f4be37c0cfd99a261a4573746bfd80d917dc955b72da84c80
SIZE (cabal/xml-types-0.3.8/xml-types-0.3.8.tar.gz) = 4054
-SHA256 (cabal/zlib-0.7.0.0/zlib-0.7.0.0.tar.gz) = 7e43c205e1e1ff5a4b033086ec8cce82ab658879e977c8ba02a6701946ff7a47
-SIZE (cabal/zlib-0.7.0.0/zlib-0.7.0.0.tar.gz) = 369149
+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/zlib-0.7.1.0/revision/2.cabal) = 85e64a75c0b490506a7edaa2d54950c668e66b65758bb08bb14cd31faf53a206
+SIZE (cabal/zlib-0.7.1.0/revision/2.cabal) = 5357
diff --git a/www/hs-gitit/Makefile b/www/hs-gitit/Makefile
index ddccd1fcaa20..8435a5b58e4c 100644
--- a/www/hs-gitit/Makefile
+++ b/www/hs-gitit/Makefile
@@ -8,6 +8,8 @@ WWW= https://github.com/jgm/gitit
LICENSE= GPLv2
+BUILD_DEPENDS= ghc-9.6.7:lang/ghc96
+
USES= cabal
OPTIONS_DEFINE= PLUGINS EXPORTS
diff --git a/www/hs-hjsmin/Makefile b/www/hs-hjsmin/Makefile
index 569f7e99fbf6..9a4f8adf1d32 100644
--- a/www/hs-hjsmin/Makefile
+++ b/www/hs-hjsmin/Makefile
@@ -12,15 +12,17 @@ USES= cabal
USE_LOCALE= en_US.UTF-8
-USE_CABAL= alex-3.2.7.1 \
- ansi-terminal-0.11.4 \
- ansi-wl-pprint-0.6.9_3 \
- blaze-builder-0.4.2.2_1 \
+USE_CABAL= alex-3.5.3.0 \
+ ansi-terminal-1.1.2 \
+ ansi-terminal-types-1.1 \
+ blaze-builder-0.4.2.3 \
colour-2.3.6 \
- happy-1.20.1.1 \
+ happy-2.1.5 \
+ happy-lib-2.1.5 \
language-javascript-0.7.1.0 \
- optparse-applicative-0.17.0.0 \
- text-2.0.2 \
+ optparse-applicative-0.18.1.0_1 \
+ prettyprinter-1.7.1 \
+ prettyprinter-ansi-terminal-1.1.3 \
transformers-compat-0.7.2 \
utf8-string-1.0.2
diff --git a/www/hs-hjsmin/distinfo b/www/hs-hjsmin/distinfo
index ebc4f60d1a27..5d369176aa08 100644
--- a/www/hs-hjsmin/distinfo
+++ b/www/hs-hjsmin/distinfo
@@ -1,28 +1,30 @@
-TIMESTAMP = 1678631222
+TIMESTAMP = 1747071474
SHA256 (cabal/hjsmin-0.2.1/hjsmin-0.2.1.tar.gz) = 4db43835a4cdfd79b9e18238fdd86c0de7e656813f8b8083c3ba8630d322cd90
SIZE (cabal/hjsmin-0.2.1/hjsmin-0.2.1.tar.gz) = 5197
-SHA256 (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec
-SIZE (cabal/alex-3.2.7.1/alex-3.2.7.1.tar.gz) = 108229
-SHA256 (cabal/ansi-terminal-0.11.4/ansi-terminal-0.11.4.tar.gz) = 7898e48f0a535c1857cde52c803f28096ba89759461fe4d157fd55dcdb420e25
-SIZE (cabal/ansi-terminal-0.11.4/ansi-terminal-0.11.4.tar.gz) = 43299
-SHA256 (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = a7b2e8e7cd3f02f2954e8b17dc60a0ccd889f49e2068ebb15abfa1d42f7a4eac
-SIZE (cabal/ansi-wl-pprint-0.6.9/ansi-wl-pprint-0.6.9.tar.gz) = 16723
-SHA256 (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 212144ea0623b1170807a4162db05d87f26cf10b334aeadd0edb377aba06a1ce
-SIZE (cabal/ansi-wl-pprint-0.6.9/revision/3.cabal) = 2425
-SHA256 (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 2cdc998c021d3a5f2a66a95138b93386271c26a117e7676d78264a90e536af67
-SIZE (cabal/blaze-builder-0.4.2.2/blaze-builder-0.4.2.2.tar.gz) = 60707
-SHA256 (cabal/blaze-builder-0.4.2.2/revision/1.cabal) = f0017df374c330de0ebe0eb15eae8c48427bddefa1d81a3cb31c0a4812ecdb08
-SIZE (cabal/blaze-builder-0.4.2.2/revision/1.cabal) = 3685
+SHA256 (cabal/alex-3.5.3.0/alex-3.5.3.0.tar.gz) = a5cd52e2dd2837138523e2e24ec3435b8cf2624afd50725105e644226e0b9ec6
+SIZE (cabal/alex-3.5.3.0/alex-3.5.3.0.tar.gz) = 92759
+SHA256 (cabal/ansi-terminal-1.1.2/ansi-terminal-1.1.2.tar.gz) = a8d04a3e0451e22a6499a92311f0df1196dc65b687df7d10e3f30d92420156b0
+SIZE (cabal/ansi-terminal-1.1.2/ansi-terminal-1.1.2.tar.gz) = 36259
+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/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/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/happy-1.20.1.1/happy-1.20.1.1.tar.gz) = 8b4e7dc5a6c5fd666f8f7163232931ab28746d0d17da8fa1cbd68be9e878881b
-SIZE (cabal/happy-1.20.1.1/happy-1.20.1.1.tar.gz) = 183409
+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/language-javascript-0.7.1.0/language-javascript-0.7.1.0.tar.gz) = d1a036aa4c747fa7a347e78dc6d3609a3d51dc28580ff6b897a27646ca7ad168
SIZE (cabal/language-javascript-0.7.1.0/language-javascript-0.7.1.0.tar.gz) = 76438
-SHA256 (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 825b2e4d3dafe0ba64a073366a88062b3712b81f851793d9ce2327bee70af724
-SIZE (cabal/optparse-applicative-0.17.0.0/optparse-applicative-0.17.0.0.tar.gz) = 59409
-SHA256 (cabal/text-2.0.2/text-2.0.2.tar.gz) = c735be650a898606ce9f2c8642bc6ac6123eea82871d5e90f92797801f59efad
-SIZE (cabal/text-2.0.2/text-2.0.2.tar.gz) = 292557
+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/prettyprinter-1.7.1/prettyprinter-1.7.1.tar.gz) = 5e6ea6903114fa118fcc359633dfb7ecddecb92c06c853d02a77b72b251f0b45
+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/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/utf8-string-1.0.2/utf8-string-1.0.2.tar.gz) = ee48deada7600370728c4156cb002441de770d0121ae33a68139a9ed9c19b09a
diff --git a/www/hs-postgrest/Makefile b/www/hs-postgrest/Makefile
index 67ad49776500..0bd5a01fb5cb 100644
--- a/www/hs-postgrest/Makefile
+++ b/www/hs-postgrest/Makefile
@@ -1,6 +1,6 @@
PORTNAME= postgrest
DISTVERSIONPREFIX= v
-DISTVERSION= 12.2.11
+DISTVERSION= 13.0.0
CATEGORIES= www databases haskell
MAINTAINER= haskell@FreeBSD.org
@@ -12,7 +12,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
ONLY_FOR_ARCHS= amd64 i386
-BUILD_DEPENDS= pg_config:databases/postgresql${PGSQL_DEFAULT}-client
+BUILD_DEPENDS= pg_config:databases/postgresql${PGSQL_DEFAULT}-client \
+ ghc-9.6.7:lang/ghc96
USES= cabal pgsql
diff --git a/www/hs-postgrest/Makefile.modules b/www/hs-postgrest/Makefile.modules
index 6506654a51ab..816d6bae22a4 100644
--- a/www/hs-postgrest/Makefile.modules
+++ b/www/hs-postgrest/Makefile.modules
@@ -5,17 +5,17 @@ USE_CABAL= HTTP-4000.4.1_5 \
QuickCheck-2.15.0.1_1 \
Ranged-sets-0.4.0_2 \
StateVar-1.2.2 \
- adjunctions-4.4.2_2 \
+ adjunctions-4.4.3 \
aeson-2.2.3.0_3 \
aeson-pretty-0.8.10 \
ansi-terminal-1.1.2 \
ansi-terminal-types-1.1 \
appar-0.1.8 \
- asn1-encoding-0.9.6 \
+ asn1-encoding-0.9.6_2 \
asn1-parse-0.9.5 \
asn1-types-0.3.4 \
assoc-1.1.1_1 \
- async-2.2.5 \
+ async-2.2.5_3 \
atomic-primops-0.8.8 \
attoparsec-0.14.4_6 \
attoparsec-aeson-2.2.2.0 \
@@ -31,8 +31,8 @@ USE_CABAL= HTTP-4000.4.1_5 \
bitvec-1.1.5.0_3 \
bsb-http-chunked-0.0.0.4_4 \
byteorder-1.0.4 \
- bytestring-strict-builder-0.4.5.7 \
- bytestring-tree-builder-0.2.7.12 \
+ bytestring-strict-builder-0.4.5.8 \
+ bytestring-tree-builder-0.2.7.13 \
cabal-doctest-1.0.11 \
cache-0.1.3.0_1 \
call-stack-0.4.0 \
@@ -40,19 +40,18 @@ USE_CABAL= HTTP-4000.4.1_5 \
cassava-0.5.3.2_1 \
cereal-0.5.8.3 \
character-ps-0.1 \
- charset-0.3.11 \
+ charset-0.3.12 \
clock-0.8.4 \
cmdargs-0.10.22 \
colour-2.3.6 \
comonad-5.0.9_1 \
- concise-0.1.0.1 \
configurator-pg-0.2.10_1 \
contravariant-1.5.5 \
contravariant-extras-0.3.5.4 \
cookie-0.4.6 \
cryptohash-md5-0.11.101.0_6 \
cryptohash-sha1-0.11.101.0_6 \
- crypton-1.0.1 \
+ crypton-1.0.4 \
crypton-x509-1.7.7 \
data-bword-0.1.0.2 \
data-checked-0.3 \
@@ -68,7 +67,7 @@ USE_CABAL= HTTP-4000.4.1_5 \
data-sketches-0.3.1.0 \
data-sketches-core-0.1.0.0 \
data-textual-0.3.0.3 \
- deferred-folds-0.9.18.6 \
+ deferred-folds-0.9.18.7 \
distributive-0.6.2.1_1 \
dlist-1.0_2 \
easy-file-0.2.5 \
@@ -81,14 +80,9 @@ USE_CABAL= HTTP-4000.4.1_5 \
fuzzyset-0.2.4 \
generically-0.1.1_4 \
generics-sop-0.5.1.4_2 \
- gitrev-1.3.1 \
groups-0.5.3 \
- happy-2.1.4 \
- happy-lib-2.1.4 \
hashable-1.4.7.0 \
hashtables-1.4.2 \
- haskell-src-exts-1.23.1 \
- haskell-src-meta-0.8.15 \
hasql-1.6.4.4 \
hasql-dynamic-statements-0.3.1.5 \
hasql-implicits-0.1.1.3 \
@@ -105,25 +99,24 @@ USE_CABAL= HTTP-4000.4.1_5 \
indexed-profunctors-0.1.1.1 \
indexed-traversable-0.1.4_1 \
indexed-traversable-instances-0.1.2_1 \
- insert-ordered-containers-0.2.6 \
+ insert-ordered-containers-0.2.7 \
integer-conversion-0.1.1_1 \
integer-logarithms-1.0.4 \
- interpolatedstring-perl6-1.0.2 \
invariant-0.6.4_1 \
iproute-1.7.15 \
- isomorphism-class-0.3 \
- jose-0.11 \
+ isomorphism-class-0.3.1.2 \
+ jose-jwt-0.10.0 \
kan-extensions-5.2.6_1 \
keys-3.12.4_1 \
- lawful-conversions-0.1.6 \
+ lawful-conversions-0.1.6.1 \
lens-5.2.3_5 \
lens-aeson-1.2.3_2 \
math-functions-0.3.4.4 \
- megaparsec-9.6.1 \
+ megaparsec-9.7.0 \
memory-0.18.0_1 \
- monad-time-0.4.0.0 \
mtl-compat-0.2.2 \
mwc-random-0.15.2.0 \
+ neat-interpolation-0.5.1.4 \
network-3.1.4.0_1 \
network-byte-order-0.1.7 \
network-control-0.0.2 \
@@ -147,23 +140,22 @@ USE_CABAL= HTTP-4000.4.1_5 \
postgresql-libpq-configure-0.10.0.1 \
prettyprinter-1.7.1 \
prettyprinter-ansi-terminal-1.1.3 \
- primitive-0.9.0.0_2 \
+ primitive-0.9.1.0 \
profunctors-5.6.2_3 \
prometheus-client-1.1.1 \
protolude-0.3.4 \
psqueues-0.2.8.1 \
- ptr-0.16.8.6 \
+ ptr-0.16.8.7 \
quickcheck-instances-0.3.32_1 \
- random-1.2.1.3 \
+ random-1.3.1 \
rebase-1.21.2 \
- recv-0.1.0 \
+ recv-0.1.1 \
reflection-2.1.9_1 \
- regex-base-0.94.0.2_4 \
- regex-tdfa-1.3.2.2_3 \
+ regex-base-0.94.0.3 \
+ regex-tdfa-1.3.2.4 \
rerebase-1.21.2 \
resourcet-1.3.0 \
retry-0.9.3.1 \
- safe-0.3.21_1 \
safe-exceptions-0.1.7.4_1 \
scientific-0.3.8.0_2 \
selective-0.7.0.1 \
@@ -176,14 +168,13 @@ USE_CABAL= HTTP-4000.4.1_5 \
splitmix-0.1.1 \
streaming-commons-0.2.3.0 \
strict-0.5.1_1 \
- strict-list-0.1.7.5 \
- swagger2-2.8.9 \
- syb-0.7.2.4 \
+ strict-list-0.1.7.6 \
+ swagger2-2.8.10 \
tagged-0.8.9 \
tasty-1.5.3_1 \
- template-haskell-compat-v0208-0.1.9.4 \
- text-builder-0.6.7.2 \
- text-builder-dev-0.3.9 \
+ template-haskell-compat-v0208-0.1.9.5 \
+ text-builder-0.6.10 \
+ text-builder-dev-0.3.10 \
text-iso8601-0.1.1_2 \
text-latin1-0.3.1 \
text-metrics-0.3.3 \
@@ -191,10 +182,6 @@ USE_CABAL= HTTP-4000.4.1_5 \
text-short-0.1.6_3 \
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-orphans-0.13.16 \
- th-reify-many-0.1.10 \
these-1.2.1_2 \
time-compat-1.9.8 \
time-manager-0.0.1 \
@@ -202,9 +189,9 @@ USE_CABAL= HTTP-4000.4.1_5 \
transformers-base-0.4.6 \
transformers-compat-0.7.2 \
type-hint-0.1 \
- unix-compat-0.7.3_1 \
+ 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 \
utf8-string-1.0.2 \
@@ -212,7 +199,7 @@ USE_CABAL= HTTP-4000.4.1_5 \
uuid-types-1.0.6_3 \
vault-0.3.1.5_10 \
vector-0.13.2.0_1 \
- vector-algorithms-0.9.0.3 \
+ vector-algorithms-0.9.1.0 \
vector-instances-3.4.2 \
vector-stream-0.1.0.1_3 \
void-0.7.3 \
diff --git a/www/hs-postgrest/distinfo b/www/hs-postgrest/distinfo
index 7f6f566d588d..a40eca6d3846 100644
--- a/www/hs-postgrest/distinfo
+++ b/www/hs-postgrest/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1745396744
+TIMESTAMP = 1747113378
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/5.cabal) = 75ada03bd2d2b747319e38877a55bf8be529db4520a07d4e5ffbd24c5e850dcb
@@ -23,10 +23,8 @@ SHA256 (cabal/Ranged-sets-0.4.0/revision/2.cabal) = 04bb4ce482fbdc052c9ee3346ba2
SIZE (cabal/Ranged-sets-0.4.0/revision/2.cabal) = 1373
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/adjunctions-4.4.2/adjunctions-4.4.2.tar.gz) = 147b5f8db810bca0ea8952ef974982ffc447cecd21f01e1ea1121df77e276518
-SIZE (cabal/adjunctions-4.4.2/adjunctions-4.4.2.tar.gz) = 17201
-SHA256 (cabal/adjunctions-4.4.2/revision/2.cabal) = 30206ae6b78d3d523c2ff73640f84b51fa204ac3f05267a5f0c77c486b96781d
-SIZE (cabal/adjunctions-4.4.2/revision/2.cabal) = 3379
+SHA256 (cabal/adjunctions-4.4.3/adjunctions-4.4.3.tar.gz) = 8beb121cee2bf913dac3188ed1e0e05cf1a0d0f12d4cb4a27c0da58450eb189a
+SIZE (cabal/adjunctions-4.4.3/adjunctions-4.4.3.tar.gz) = 16788
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
@@ -41,6 +39,8 @@ SHA256 (cabal/appar-0.1.8/appar-0.1.8.tar.gz) = c4ceeddc26525b58d82c41b6d3e32141
SIZE (cabal/appar-0.1.8/appar-0.1.8.tar.gz) = 4037
SHA256 (cabal/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz) = d9f8deabd3b908e5cf83c0d813c08dc0143b3ec1c0d97f660d2cfa02c1c8da0a
SIZE (cabal/asn1-encoding-0.9.6/asn1-encoding-0.9.6.tar.gz) = 17343
+SHA256 (cabal/asn1-encoding-0.9.6/revision/2.cabal) = 27ed8f6043aed79630313bb931f7c8e2b510f0b4586cd55c16ae040c7d1ea098
+SIZE (cabal/asn1-encoding-0.9.6/revision/2.cabal) = 2060
SHA256 (cabal/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz) = 8f1fe1344d30b39dc594d74df2c55209577722af1497204b4c2b6d6e8747f39e
SIZE (cabal/asn1-parse-0.9.5/asn1-parse-0.9.5.tar.gz) = 2951
SHA256 (cabal/asn1-types-0.3.4/asn1-types-0.3.4.tar.gz) = 78ee92a251379298ca820fa53edbf4b33c539b9fcd887c86f520c30e3b4e21a8
@@ -51,6 +51,8 @@ SHA256 (cabal/assoc-1.1.1/revision/1.cabal) = 0ab39b4d1feb4caca95ac6e314f48782b2
SIZE (cabal/assoc-1.1.1/revision/1.cabal) = 1420
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/3.cabal) = b7648c6165729a973d95cb328f9fd874813a81c727707e8b2552b4f03399763b
+SIZE (cabal/async-2.2.5/revision/3.cabal) = 3366
SHA256 (cabal/atomic-primops-0.8.8/atomic-primops-0.8.8.tar.gz) = c040ce4109258776100dd8942d6e746e4c26f918398fb3804e78dbe5bd73e7ea
SIZE (cabal/atomic-primops-0.8.8/atomic-primops-0.8.8.tar.gz) = 34182
SHA256 (cabal/attoparsec-0.14.4/attoparsec-0.14.4.tar.gz) = 3f337fe58624565de12426f607c23e60c7b09c86b4e3adfc827ca188c9979e6c
@@ -91,10 +93,10 @@ SHA256 (cabal/bsb-http-chunked-0.0.0.4/revision/4.cabal) = 1cce7371c31b1d3cfa3eb
SIZE (cabal/bsb-http-chunked-0.0.0.4/revision/4.cabal) = 2687
SHA256 (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = bd20bbb586947f99c38a4c93d9d0266f49f6fc581767b51ba568f6d5d52d2919
SIZE (cabal/byteorder-1.0.4/byteorder-1.0.4.tar.gz) = 2030
-SHA256 (cabal/bytestring-strict-builder-0.4.5.7/bytestring-strict-builder-0.4.5.7.tar.gz) = d7a6b1727cb916b4a9ca85a354ae2ce886b73d01ba7b1a488571ab64b4f774f1
-SIZE (cabal/bytestring-strict-builder-0.4.5.7/bytestring-strict-builder-0.4.5.7.tar.gz) = 7268
-SHA256 (cabal/bytestring-tree-builder-0.2.7.12/bytestring-tree-builder-0.2.7.12.tar.gz) = 90d8231350d21053ac2d97c3981bd74ae9f842e7696e8a249657815825459237
-SIZE (cabal/bytestring-tree-builder-0.2.7.12/bytestring-tree-builder-0.2.7.12.tar.gz) = 5498
+SHA256 (cabal/bytestring-strict-builder-0.4.5.8/bytestring-strict-builder-0.4.5.8.tar.gz) = 3b9ae00a210638d7d3972247f7106e51735327081cda17f4d0c1283b1ca2dd0b
+SIZE (cabal/bytestring-strict-builder-0.4.5.8/bytestring-strict-builder-0.4.5.8.tar.gz) = 7265
+SHA256 (cabal/bytestring-tree-builder-0.2.7.13/bytestring-tree-builder-0.2.7.13.tar.gz) = 8f7e532e617393dfb2c285e0311317345ba108fc014b31c618f4279046fa6768
+SIZE (cabal/bytestring-tree-builder-0.2.7.13/bytestring-tree-builder-0.2.7.13.tar.gz) = 5496
SHA256 (cabal/cabal-doctest-1.0.11/cabal-doctest-1.0.11.tar.gz) = dc2df2f0b427028617f10e445ff8ab3352d3bbeef1b8dd847e879d2d36bf923f
SIZE (cabal/cabal-doctest-1.0.11/cabal-doctest-1.0.11.tar.gz) = 13204
SHA256 (cabal/cache-0.1.3.0/cache-0.1.3.0.tar.gz) = 42e9d9f040fab2fd5fc1095a901d6348de73342b1d14254bdaf6ca3d4f11e534
@@ -113,8 +115,8 @@ SHA256 (cabal/cereal-0.5.8.3/cereal-0.5.8.3.tar.gz) = 99905220661b26e5bd91130bd9
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
SIZE (cabal/character-ps-0.1/character-ps-0.1.tar.gz) = 8192
-SHA256 (cabal/charset-0.3.11/charset-0.3.11.tar.gz) = 9343757569249865b42aa218461c311d619d3c8027dfddbb635146363cc08aac
-SIZE (cabal/charset-0.3.11/charset-0.3.11.tar.gz) = 13650
+SHA256 (cabal/charset-0.3.12/charset-0.3.12.tar.gz) = 1ce8c6d444ae9d5685099fe118fda2744c4a6037559507d8213ff686dfca722d
+SIZE (cabal/charset-0.3.12/charset-0.3.12.tar.gz) = 13687
SHA256 (cabal/clock-0.8.4/clock-0.8.4.tar.gz) = 6ae9898afe788a5e334cd5fad5d18a3c2e8e59fa09aaf7b957dbb38a4767df2e
SIZE (cabal/clock-0.8.4/clock-0.8.4.tar.gz) = 9322
SHA256 (cabal/cmdargs-0.10.22/cmdargs-0.10.22.tar.gz) = b8b12e7f8795cf13037bb062d453b86c788eae62558586f59e9419aabe6e9bef
@@ -125,8 +127,6 @@ SHA256 (cabal/comonad-5.0.9/comonad-5.0.9.tar.gz) = 69fb0eb49a80055a9b76d31d0a56
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/concise-0.1.0.1/concise-0.1.0.1.tar.gz) = 5c27df5a3e1fe820548e90abc4a0e326b6d0fb286218619aa22d3af90c7b9925
-SIZE (cabal/concise-0.1.0.1/concise-0.1.0.1.tar.gz) = 3415
SHA256 (cabal/configurator-pg-0.2.10/configurator-pg-0.2.10.tar.gz) = 527b96469442706ce51ab9b41681434fca413945b5ab868bd2778b66fe3d4689
SIZE (cabal/configurator-pg-0.2.10/configurator-pg-0.2.10.tar.gz) = 12239
SHA256 (cabal/configurator-pg-0.2.10/revision/1.cabal) = 20a0307d5b0080e6ce571706a2a391c44cc0d12c9372fad0015067ecfdc5bfec
@@ -145,8 +145,8 @@ SHA256 (cabal/cryptohash-sha1-0.11.101.0/cryptohash-sha1-0.11.101.0.tar.gz) = a4
SIZE (cabal/cryptohash-sha1-0.11.101.0/cryptohash-sha1-0.11.101.0.tar.gz) = 11563
SHA256 (cabal/cryptohash-sha1-0.11.101.0/revision/6.cabal) = 2bdf29dbd896bca86bf198c882fa8df1cb31843b71f2907e059b7c10bce0adb3
SIZE (cabal/cryptohash-sha1-0.11.101.0/revision/6.cabal) = 3085
-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-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/data-bword-0.1.0.2/data-bword-0.1.0.2.tar.gz) = d64880e7d6c7a2d635d7e79552888f415a417379ee637a29321abf08187e9635
@@ -179,8 +179,8 @@ SHA256 (cabal/data-sketches-core-0.1.0.0/data-sketches-core-0.1.0.0.tar.gz) = 23
SIZE (cabal/data-sketches-core-0.1.0.0/data-sketches-core-0.1.0.0.tar.gz) = 12544
SHA256 (cabal/data-textual-0.3.0.3/data-textual-0.3.0.3.tar.gz) = 4b9ee8ccd03f24203dd9307bf9aa67180ff0f07b45c3a01e33d8185ff275ec9a
SIZE (cabal/data-textual-0.3.0.3/data-textual-0.3.0.3.tar.gz) = 15626
-SHA256 (cabal/deferred-folds-0.9.18.6/deferred-folds-0.9.18.6.tar.gz) = ebffce410040c77d2babee73f45ab7e79da7dcec424590a991b6dc0b8a1b8f02
-SIZE (cabal/deferred-folds-0.9.18.6/deferred-folds-0.9.18.6.tar.gz) = 10380
+SHA256 (cabal/deferred-folds-0.9.18.7/deferred-folds-0.9.18.7.tar.gz) = cfa84475ecd37db1f9421a86c84e02bdc60c7b3847daca12dc5705ff7f0178ae
+SIZE (cabal/deferred-folds-0.9.18.7/deferred-folds-0.9.18.7.tar.gz) = 10386
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
@@ -219,22 +219,12 @@ SHA256 (cabal/generics-sop-0.5.1.4/generics-sop-0.5.1.4.tar.gz) = 616a1c21760974
SIZE (cabal/generics-sop-0.5.1.4/generics-sop-0.5.1.4.tar.gz) = 30137
SHA256 (cabal/generics-sop-0.5.1.4/revision/2.cabal) = a62864a0a096f844db946a38c3b9981f20cc50cb36ef8bbb148b695976ae4c75
SIZE (cabal/generics-sop-0.5.1.4/revision/2.cabal) = 5770
-SHA256 (cabal/gitrev-1.3.1/gitrev-1.3.1.tar.gz) = a89964db24f56727b0e7b10c98fe7c116d721d8c46f52d6e77088669aaa38332
-SIZE (cabal/gitrev-1.3.1/gitrev-1.3.1.tar.gz) = 3756
SHA256 (cabal/groups-0.5.3/groups-0.5.3.tar.gz) = ce1e52a8be7effbd1f995eadf0ed34fa45c412656d372db8a38f9c955e43ac38
SIZE (cabal/groups-0.5.3/groups-0.5.3.tar.gz) = 3396
-SHA256 (cabal/happy-2.1.4/happy-2.1.4.tar.gz) = 6d71f93efc9e40d1573c6d9ffe2fea644ff2e7005628efca93cb229e5f3a6033
-SIZE (cabal/happy-2.1.4/happy-2.1.4.tar.gz) = 61239
-SHA256 (cabal/happy-lib-2.1.4/happy-lib-2.1.4.tar.gz) = 7eeb499c69291c18c317e59ade03979c61f6225e68caba901c7d7b417d9bfa8a
-SIZE (cabal/happy-lib-2.1.4/happy-lib-2.1.4.tar.gz) = 93780
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/hashtables-1.4.2/hashtables-1.4.2.tar.gz) = ca0e299fee6c0c918f45ce0907afbff1c3891998bb792d1717e4d5f12350ef0d
SIZE (cabal/hashtables-1.4.2/hashtables-1.4.2.tar.gz) = 58869
-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/hasql-1.6.4.4/hasql-1.6.4.4.tar.gz) = 4da966e6f267665b89045ff73a04b7da0887bd6ff7304ae60a6ef382cb4e99d7
SIZE (cabal/hasql-1.6.4.4/hasql-1.6.4.4.tar.gz) = 31915
SHA256 (cabal/hasql-dynamic-statements-0.3.1.5/hasql-dynamic-statements-0.3.1.5.tar.gz) = d74cd64e33e3c6b2da63e543d2c41b023fd16f02869878136f161abe4b1eecc0
@@ -277,26 +267,24 @@ SHA256 (cabal/indexed-traversable-instances-0.1.2/indexed-traversable-instances-
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/insert-ordered-containers-0.2.6/insert-ordered-containers-0.2.6.tar.gz) = ef52e54b176e4a0828e5822784e28005fa8a848357a88722182350b3c3d0c49f
-SIZE (cabal/insert-ordered-containers-0.2.6/insert-ordered-containers-0.2.6.tar.gz) = 10586
+SHA256 (cabal/insert-ordered-containers-0.2.7/insert-ordered-containers-0.2.7.tar.gz) = 77edbb1b76e6598aeb05f0711942976432b52178cbfd2a62f4a87f3baf623617
+SIZE (cabal/insert-ordered-containers-0.2.7/insert-ordered-containers-0.2.7.tar.gz) = 10623
SHA256 (cabal/integer-conversion-0.1.1/integer-conversion-0.1.1.tar.gz) = c18164a048073310f6353ebc64c9037b52a4b8299963ce05e027bcf60e22155a
SIZE (cabal/integer-conversion-0.1.1/integer-conversion-0.1.1.tar.gz) = 6179
SHA256 (cabal/integer-conversion-0.1.1/revision/1.cabal) = 941d4ae16e2124cbff5defe2abedb49efc8e03a594f817035bf231a317e6c1c9
SIZE (cabal/integer-conversion-0.1.1/revision/1.cabal) = 2256
SHA256 (cabal/integer-logarithms-1.0.4/integer-logarithms-1.0.4.tar.gz) = 6a93c76c2518cbe2d72ab17da6ae46d8cae93cbfb7c5a5ad5783f903c1448f45
SIZE (cabal/integer-logarithms-1.0.4/integer-logarithms-1.0.4.tar.gz) = 8948
-SHA256 (cabal/interpolatedstring-perl6-1.0.2/interpolatedstring-perl6-1.0.2.tar.gz) = 5a8b1e8b65253ce1e1b07b9de1075e9306483160a7b419d5f126d7e2744b7bb7
-SIZE (cabal/interpolatedstring-perl6-1.0.2/interpolatedstring-perl6-1.0.2.tar.gz) = 6512
SHA256 (cabal/invariant-0.6.4/invariant-0.6.4.tar.gz) = a9e2ab4ee3e0d4613beb7bda36a8ebc4f72318450514f4832d2fa43b74f0aeb3
SIZE (cabal/invariant-0.6.4/invariant-0.6.4.tar.gz) = 27079
SHA256 (cabal/invariant-0.6.4/revision/1.cabal) = 4a9a609f4e93ffed158b3b4f5a80822c6da30aa71a5370307c0c00c2d658d1c6
SIZE (cabal/invariant-0.6.4/revision/1.cabal) = 3513
SHA256 (cabal/iproute-1.7.15/iproute-1.7.15.tar.gz) = 18a331a7e0e6f9dc89a2da95577b0d76bd2690b8f832b72b46d6cc9b667b4ba5
SIZE (cabal/iproute-1.7.15/iproute-1.7.15.tar.gz) = 18033
-SHA256 (cabal/isomorphism-class-0.3/isomorphism-class-0.3.tar.gz) = 39f07d6586782ce9b021aff7eabeebce3a59ed3923db69121d01cd054cee90c8
-SIZE (cabal/isomorphism-class-0.3/isomorphism-class-0.3.tar.gz) = 9869
-SHA256 (cabal/jose-0.11/jose-0.11.tar.gz) = 2974e73d899208dccbb18cac889acceaebb7439e43046ac32c9c702e49f70b40
-SIZE (cabal/jose-0.11/jose-0.11.tar.gz) = 542432
+SHA256 (cabal/isomorphism-class-0.3.1.2/isomorphism-class-0.3.1.2.tar.gz) = 2c32cae55b8b8e3ca347e4898b8e0f3713d1a15a283c14718b0149b3fbbe527f
+SIZE (cabal/isomorphism-class-0.3.1.2/isomorphism-class-0.3.1.2.tar.gz) = 10497
+SHA256 (cabal/jose-jwt-0.10.0/jose-jwt-0.10.0.tar.gz) = e84caf97eb70bf21a4cf9933be23a5336163276c895e44f854d73947988d4b52
+SIZE (cabal/jose-jwt-0.10.0/jose-jwt-0.10.0.tar.gz) = 41308
SHA256 (cabal/kan-extensions-5.2.6/kan-extensions-5.2.6.tar.gz) = fa82283c1c9ac3dc0951b7ca9f5b2e6f13d8331c20154ebb222b509824eeeccc
SIZE (cabal/kan-extensions-5.2.6/kan-extensions-5.2.6.tar.gz) = 21718
SHA256 (cabal/kan-extensions-5.2.6/revision/1.cabal) = e0b972f900a3c04c0f36d7e221e6b04343a5a1f00ce3aababff7932e173f0833
@@ -305,8 +293,8 @@ SHA256 (cabal/keys-3.12.4/keys-3.12.4.tar.gz) = 9412a2135cbf7fb285e01016aeb311d0
SIZE (cabal/keys-3.12.4/keys-3.12.4.tar.gz) = 11890
SHA256 (cabal/keys-3.12.4/revision/1.cabal) = ce43085eb0506a2fff6020dc61351e1c0c61c29f90d3ea5030756f3ed50caa16
SIZE (cabal/keys-3.12.4/revision/1.cabal) = 2232
-SHA256 (cabal/lawful-conversions-0.1.6/lawful-conversions-0.1.6.tar.gz) = 6fcdca00fc797216363b10e602a151908657148cf63202c388d0565d1efae4be
-SIZE (cabal/lawful-conversions-0.1.6/lawful-conversions-0.1.6.tar.gz) = 14843
+SHA256 (cabal/lawful-conversions-0.1.6.1/lawful-conversions-0.1.6.1.tar.gz) = af9150aaf103cb2c2f4297a000e54fccad4b559787ec30b7fd7ff361d638b7a1
+SIZE (cabal/lawful-conversions-0.1.6.1/lawful-conversions-0.1.6.1.tar.gz) = 14663
SHA256 (cabal/lens-5.2.3/lens-5.2.3.tar.gz) = df1e8ca8dd89d884994e0c80761a972088326fa43ed5d47c01b14abb710b994d
SIZE (cabal/lens-5.2.3/lens-5.2.3.tar.gz) = 703220
SHA256 (cabal/lens-5.2.3/revision/5.cabal) = 08f4e81aa3fa3f175f6932089d6bb8b17669e3d00aa2968b853287e5e8d7f024
@@ -317,18 +305,18 @@ SHA256 (cabal/lens-aeson-1.2.3/revision/2.cabal) = 5a733b4b5ac8e17d1e89704441597
SIZE (cabal/lens-aeson-1.2.3/revision/2.cabal) = 1691
SHA256 (cabal/math-functions-0.3.4.4/math-functions-0.3.4.4.tar.gz) = 2441d8dd50eff445356048b2a0cdf88c4a7ba0f56614293d4975e1b081faf8fa
SIZE (cabal/math-functions-0.3.4.4/math-functions-0.3.4.4.tar.gz) = 429048
-SHA256 (cabal/megaparsec-9.6.1/megaparsec-9.6.1.tar.gz) = a32257be847dbe71ac22d512ab115f9ce26fa08bcdbea7ca8b5256a1700dcbff
-SIZE (cabal/megaparsec-9.6.1/megaparsec-9.6.1.tar.gz) = 64913
+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/memory-0.18.0/revision/1.cabal) = 9f4de967352f80b6f174c9a166f315393dde80b77d7b67e41268ae7dec0319f9
SIZE (cabal/memory-0.18.0/revision/1.cabal) = 4581
-SHA256 (cabal/monad-time-0.4.0.0/monad-time-0.4.0.0.tar.gz) = b4493edf9e7f839cb4ccfcdd53845de493bffbb3ceb4fbb54ba173db68192960
-SIZE (cabal/monad-time-0.4.0.0/monad-time-0.4.0.0.tar.gz) = 2471
SHA256 (cabal/mtl-compat-0.2.2/mtl-compat-0.2.2.tar.gz) = 1955398fe2115674f47f553b2caaf928c6aa3424271a5cd13bc191e54bfe3a9e
SIZE (cabal/mtl-compat-0.2.2/mtl-compat-0.2.2.tar.gz) = 5128
SHA256 (cabal/mwc-random-0.15.2.0/mwc-random-0.15.2.0.tar.gz) = 5843ab06e7c9109326aa4eb5e26486400d6e3bce25944f6671ce989499174133
SIZE (cabal/mwc-random-0.15.2.0/mwc-random-0.15.2.0.tar.gz) = 43086
+SHA256 (cabal/neat-interpolation-0.5.1.4/neat-interpolation-0.5.1.4.tar.gz) = 8eb733e3b1d90d87e0cff8b648f4b8145e38afd558f2c8343029770c9f023ab7
+SIZE (cabal/neat-interpolation-0.5.1.4/neat-interpolation-0.5.1.4.tar.gz) = 5741
SHA256 (cabal/network-3.1.4.0/network-3.1.4.0.tar.gz) = b452a2afac95d9207357eb3820c719c7c7d27871ef4b6ed7bfcd03a036b9158e
SIZE (cabal/network-3.1.4.0/network-3.1.4.0.tar.gz) = 139988
SHA256 (cabal/network-3.1.4.0/revision/1.cabal) = e152cdb03243afb52bbc740cfbe96905ca298a6f6342f0c47b3f2e227ff19def
@@ -397,10 +385,8 @@ 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/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 65955d7b50525a4a3bccdab1d982d2ae342897fd38140d5a94b5ef3800d8c92a
SIZE (cabal/profunctors-5.6.2/profunctors-5.6.2.tar.gz) = 28522
SHA256 (cabal/profunctors-5.6.2/revision/3.cabal) = e178ba4468982326656626e2089e296f64485e68fdddc9f4476dcd5d612b4f78
@@ -411,40 +397,32 @@ SHA256 (cabal/protolude-0.3.4/protolude-0.3.4.tar.gz) = f838998212470de45d5d70e3
SIZE (cabal/protolude-0.3.4/protolude-0.3.4.tar.gz) = 19321
SHA256 (cabal/psqueues-0.2.8.1/psqueues-0.2.8.1.tar.gz) = cb7e102f09e373b4a7be52bfbc9625d265c7216d05fe04c36b7ad684ed213f77
SIZE (cabal/psqueues-0.2.8.1/psqueues-0.2.8.1.tar.gz) = 27584
-SHA256 (cabal/ptr-0.16.8.6/ptr-0.16.8.6.tar.gz) = 1a18218b6117ce326df36a3a045a5250e04e19f2f29f90b1dd5bede08f83caa5
-SIZE (cabal/ptr-0.16.8.6/ptr-0.16.8.6.tar.gz) = 17694
+SHA256 (cabal/ptr-0.16.8.7/ptr-0.16.8.7.tar.gz) = 060b47508056206a8ce655e1665f131a705b8670970d30feaf37ea1d28b26802
+SIZE (cabal/ptr-0.16.8.7/ptr-0.16.8.7.tar.gz) = 17690
SHA256 (cabal/quickcheck-instances-0.3.32/quickcheck-instances-0.3.32.tar.gz) = 48f5f2e015e2349ac795247917cbf5f1a2e96a7a1382c4441a935e19a430ff83
SIZE (cabal/quickcheck-instances-0.3.32/quickcheck-instances-0.3.32.tar.gz) = 12831
SHA256 (cabal/quickcheck-instances-0.3.32/revision/1.cabal) = 8772458bddd354e07102bf05b45976896c278282e71ff8420beac6b9b77efb34
SIZE (cabal/quickcheck-instances-0.3.32/revision/1.cabal) = 4340
-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/rebase-1.21.2/rebase-1.21.2.tar.gz) = 6c19f5576c888078f0c7f172da05873611bfc070617d033f4f14fedd3e82fffb
SIZE (cabal/rebase-1.21.2/rebase-1.21.2.tar.gz) = 20324
-SHA256 (cabal/recv-0.1.0/recv-0.1.0.tar.gz) = f664905cffb44b7f9cba604cd75bd69011a666ba06bccbcb7f3fae0cd4f14d5b
-SIZE (cabal/recv-0.1.0/recv-0.1.0.tar.gz) = 5158
+SHA256 (cabal/recv-0.1.1/recv-0.1.1.tar.gz) = 8daf77c57f529503dd3038efc3813a8001032ed810bdddff0acb0faca039b721
+SIZE (cabal/recv-0.1.1/recv-0.1.1.tar.gz) = 4772
SHA256 (cabal/reflection-2.1.9/reflection-2.1.9.tar.gz) = c6a7d5e41ad0ee1a05c660acf4fd34b21f38330eec165d246b7fffb398e59fb3
SIZE (cabal/reflection-2.1.9/reflection-2.1.9.tar.gz) = 17560
SHA256 (cabal/reflection-2.1.9/revision/1.cabal) = eaf28dc9884718a306ed1e0c215a24b36c68b8aa3be425617f66d886d43fe1e0
SIZE (cabal/reflection-2.1.9/revision/1.cabal) = 4171
-SHA256 (cabal/regex-base-0.94.0.2/regex-base-0.94.0.2.tar.gz) = 7b99408f580f5bb67a1c413e0bc735886608251331ad36322020f2169aea2ef1
-SIZE (cabal/regex-base-0.94.0.2/regex-base-0.94.0.2.tar.gz) = 10488
-SHA256 (cabal/regex-base-0.94.0.2/revision/4.cabal) = 0322b2fcd1358f3355e0c8608efa60d27b14d1c9d476451dbcb9181363bd8b27
-SIZE (cabal/regex-base-0.94.0.2/revision/4.cabal) = 2601
-SHA256 (cabal/regex-tdfa-1.3.2.2/regex-tdfa-1.3.2.2.tar.gz) = 933ed5c54246bb50e335d86b884ffb70bc252b5f776fb291f162a80a27bd75b7
-SIZE (cabal/regex-tdfa-1.3.2.2/regex-tdfa-1.3.2.2.tar.gz) = 83016
-SHA256 (cabal/regex-tdfa-1.3.2.2/revision/3.cabal) = e5ea15b2898c62c63fae798784bc402b3862733d97a4f7ee3ec4f9ae6f447478
-SIZE (cabal/regex-tdfa-1.3.2.2/revision/3.cabal) = 6997
+SHA256 (cabal/regex-base-0.94.0.3/regex-base-0.94.0.3.tar.gz) = e8ca2dee598c790dd1c1c4359bdd1e495d9b881f5aa1f539c22f0dd5563747bf
+SIZE (cabal/regex-base-0.94.0.3/regex-base-0.94.0.3.tar.gz) = 10550
+SHA256 (cabal/regex-tdfa-1.3.2.4/regex-tdfa-1.3.2.4.tar.gz) = 078bc313b7441f173eb487d6f46fea6860a21452eff6e5cf730ac4dd74bca797
+SIZE (cabal/regex-tdfa-1.3.2.4/regex-tdfa-1.3.2.4.tar.gz) = 83099
SHA256 (cabal/rerebase-1.21.2/rerebase-1.21.2.tar.gz) = 77cc0d707ee0886b49206065476e77d0600e4c305b37701a38ef55e736a7fc10
SIZE (cabal/rerebase-1.21.2/rerebase-1.21.2.tar.gz) = 17208
SHA256 (cabal/resourcet-1.3.0/resourcet-1.3.0.tar.gz) = ec601785ee42a201f32adb205b8685c983f18757b1bd33d2e806d571e0f9996b
SIZE (cabal/resourcet-1.3.0/resourcet-1.3.0.tar.gz) = 17620
SHA256 (cabal/retry-0.9.3.1/retry-0.9.3.1.tar.gz) = 622e35114b920f76fa2e1ae6515575b9973fac19c679f5426ea6574a5d0b7ed6
SIZE (cabal/retry-0.9.3.1/retry-0.9.3.1.tar.gz) = 18717
-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
@@ -481,24 +459,22 @@ SHA256 (cabal/strict-0.5.1/strict-0.5.1.tar.gz) = 77719280c2a86312e748227bfa732e
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/strict-list-0.1.7.5/strict-list-0.1.7.5.tar.gz) = c3e3ff3e3f7bee7eff26511c92c26c14b8ac7cbdefba7fb9e24c4aa4ff01236b
-SIZE (cabal/strict-list-0.1.7.5/strict-list-0.1.7.5.tar.gz) = 6785
-SHA256 (cabal/swagger2-2.8.9/swagger2-2.8.9.tar.gz) = 92a37bbfba482d6eaeedf8dd24a9658bdc9d7514fa51d7b8ab4c6e65a3c9caa1
-SIZE (cabal/swagger2-2.8.9/swagger2-2.8.9.tar.gz) = 66957
-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/strict-list-0.1.7.6/strict-list-0.1.7.6.tar.gz) = 756b16c12b5528cdb44ba905bdc78e5f4a749f33f630226645311a8d52207987
+SIZE (cabal/strict-list-0.1.7.6/strict-list-0.1.7.6.tar.gz) = 6786
+SHA256 (cabal/swagger2-2.8.10/swagger2-2.8.10.tar.gz) = 9217e63872beb80fb581c73a752e70fa21f2d7eaab5e86b014bdaead0dadc3e7
+SIZE (cabal/swagger2-2.8.10/swagger2-2.8.10.tar.gz) = 66780
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/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/template-haskell-compat-v0208-0.1.9.4/template-haskell-compat-v0208-0.1.9.4.tar.gz) = 567718b6f56dbf0f0e42ba35a7d6346185e35d640402932fd1956b19dfcd518a
-SIZE (cabal/template-haskell-compat-v0208-0.1.9.4/template-haskell-compat-v0208-0.1.9.4.tar.gz) = 3198
-SHA256 (cabal/text-builder-0.6.7.2/text-builder-0.6.7.2.tar.gz) = 6194f3076933bbe361e225461a10fd8ab29bd5476294ffb80a6af17c8535c7dd
-SIZE (cabal/text-builder-0.6.7.2/text-builder-0.6.7.2.tar.gz) = 6093
-SHA256 (cabal/text-builder-dev-0.3.9/text-builder-dev-0.3.9.tar.gz) = 90071fbd545673575b619a2839509ad36137a9bdcd28c2d5e2eaa4b3067f4e1e
-SIZE (cabal/text-builder-dev-0.3.9/text-builder-dev-0.3.9.tar.gz) = 13779
+SHA256 (cabal/template-haskell-compat-v0208-0.1.9.5/template-haskell-compat-v0208-0.1.9.5.tar.gz) = 51359f8dc8d51f30b59521d214837d13c4f6c9b5c4afd0eba813c26cc2449d1f
+SIZE (cabal/template-haskell-compat-v0208-0.1.9.5/template-haskell-compat-v0208-0.1.9.5.tar.gz) = 3194
+SHA256 (cabal/text-builder-0.6.10/text-builder-0.6.10.tar.gz) = 063111d149a202ee6a22e54c36dcf6b4386406059a60e33fc9fd13dc6f255f51
+SIZE (cabal/text-builder-0.6.10/text-builder-0.6.10.tar.gz) = 7301
+SHA256 (cabal/text-builder-dev-0.3.10/text-builder-dev-0.3.10.tar.gz) = 433fcb971640b0530c43d8abae05c3b0527b6632b26d8aba044dcd0dfad29454
+SIZE (cabal/text-builder-dev-0.3.10/text-builder-dev-0.3.10.tar.gz) = 13557
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
@@ -519,14 +495,6 @@ SHA256 (cabal/th-abstraction-0.7.1.0/revision/1.cabal) = 3011403d85b0070630e33d6
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-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/2.cabal) = 35c57aede96c15ea1fed559ac287b1168eb2b2869d79e62ed8c845780b7ea136
@@ -545,14 +513,12 @@ SHA256 (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = b62c
SIZE (cabal/transformers-compat-0.7.2/transformers-compat-0.7.2.tar.gz) = 46485
SHA256 (cabal/type-hint-0.1/type-hint-0.1.tar.gz) = 1161cdbf4b4b43c2953ee60438e948737604193e1bfe2c880ff178538faa99b9
SIZE (cabal/type-hint-0.1/type-hint-0.1.tar.gz) = 3092
-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/unix-compat-0.7.3/revision/1.cabal) = e1132808d30ad1adbcf1ba7f06c3dfe712a7ee382b225eb975e0ab8cfe0c21cd
-SIZE (cabal/unix-compat-0.7.3/revision/1.cabal) = 3287
+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
@@ -579,8 +545,8 @@ SHA256 (cabal/vector-0.13.2.0/vector-0.13.2.0.tar.gz) = 28f203c786cbf8ac6dc3fea3
SIZE (cabal/vector-0.13.2.0/vector-0.13.2.0.tar.gz) = 185739
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.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-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-instances-3.4.2/vector-instances-3.4.2.tar.gz) = 34d92d6e77f64e8f7d79cde4a1d61799faec1b760b144935afc6f4a78877d667
SIZE (cabal/vector-instances-3.4.2/vector-instances-3.4.2.tar.gz) = 4042
SHA256 (cabal/vector-stream-0.1.0.1/vector-stream-0.1.0.1.tar.gz) = d0f507334bdea5431a2f07f525a97f29e76522c32210f5de6d5a2b4f1d42bf7c
@@ -609,5 +575,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/PostgREST-postgrest-v12.2.11_GH0.tar.gz) = 7e99b36e293b2a695dceff477a58bc5ff3aa4ece3e369fb4017bd78d2caa7f90
-SIZE (cabal/PostgREST-postgrest-v12.2.11_GH0.tar.gz) = 1818927
+SHA256 (cabal/PostgREST-postgrest-v13.0.0_GH0.tar.gz) = 61273ba81af1c84965695f35ff058da576d968b70a781ea6445701cb75929b97
+SIZE (cabal/PostgREST-postgrest-v13.0.0_GH0.tar.gz) = 1836917
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 9e04575c9bb4..c78043deb278 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -1,6 +1,6 @@
PORTNAME= ilias
DISTVERSIONPREFIX= v
-DISTVERSION= 9.8
+DISTVERSION= 9.9
CATEGORIES= www education
PKGNAMEPREFIX= ${PHP_PKGNAMEPREFIX}
diff --git a/www/ilias/distinfo b/www/ilias/distinfo
index 3dc99d430632..2c13f3e68015 100644
--- a/www/ilias/distinfo
+++ b/www/ilias/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743576853
-SHA256 (ILIAS-eLearning-ILIAS-v9.8_GH0.tar.gz) = 6514fd6e2512da539bc690db355e351c4dfc0ef0bb3d693e055a7205bc8b602d
-SIZE (ILIAS-eLearning-ILIAS-v9.8_GH0.tar.gz) = 31883618
+TIMESTAMP = 1747811218
+SHA256 (ILIAS-eLearning-ILIAS-v9.9_GH0.tar.gz) = cc97b2b1d96f9514466e253175736af95e3bc75842b8e9063c48d2b36c58029f
+SIZE (ILIAS-eLearning-ILIAS-v9.9_GH0.tar.gz) = 31900295
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index d2c911f84d6f..5c87dc11671a 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -1,5 +1,6 @@
PORTNAME= iridium
-PORTVERSION= 2025.05.136.1
+PORTVERSION= 2025.05.136.2
+PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
CATEGORIES= www wayland
@@ -18,7 +19,7 @@ WWW= https://iridiumbrowser.de/
LICENSE= BSD3CLAUSE LGPL21 MPL11
LICENSE_COMB= multi
-ONLY_FOR_ARCHS= aarch64 amd64 i386
+ONLY_FOR_ARCHS= aarch64 amd64
BUILD_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
diff --git a/www/iridium/distinfo b/www/iridium/distinfo
index 803215ab849b..58d0b1608e14 100644
--- a/www/iridium/distinfo
+++ b/www/iridium/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1746686164
-SHA256 (iridium-browser-2025.05.136.1.tar.xz) = 5baa038eeafcc04a199cff7f512839b9ac3fdac71fe496af9ff3c8544f51f9ae
-SIZE (iridium-browser-2025.05.136.1.tar.xz) = 3044399212
+TIMESTAMP = 1747324897
+SHA256 (iridium-browser-2025.05.136.2.tar.xz) = 49c4e1db1c81b78f83c0eb4b1e3a85daba92a01b741e857bf9d56e5fc33d0c82
+SIZE (iridium-browser-2025.05.136.2.tar.xz) = 3044410956
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
diff --git a/www/iridium/files/patch-build_rust_allocator_BUILD.gn b/www/iridium/files/patch-build_rust_allocator_BUILD.gn
new file mode 100644
index 000000000000..cb1633140dcc
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_BUILD.gn
@@ -0,0 +1,109 @@
+--- build/rust/allocator/BUILD.gn.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/BUILD.gn
+@@ -0,0 +1,106 @@
++# Copyright 2025 The Chromium Authors
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/buildflag_header.gni")
++import("//build/config/rust.gni")
++import("//build/rust/rust_static_library.gni")
++
++rust_allocator_uses_partition_alloc = false
++if (build_with_chromium) {
++ import("//base/allocator/partition_allocator/partition_alloc.gni")
++ rust_allocator_uses_partition_alloc = use_partition_alloc_as_malloc
++}
++
++# In ASAN builds, PartitionAlloc-Everywhere is disabled, meaning malloc() and
++# friends in C++ do not go to PartitionAlloc. So we also don't point the Rust
++# allocation functions at PartitionAlloc. Generally, this means we just direct
++# them to the Standard Library's allocator.
++#
++# However, on Windows the Standard Library uses HeapAlloc() and Windows ASAN
++# does *not* hook that method, so ASAN does not get to hear about allocations
++# made in Rust. To resolve this, we redirect allocation to _aligned_malloc
++# which Windows ASAN *does* hook.
++#
++# Note that there is a runtime option to make ASAN hook HeapAlloc() but
++# enabling it breaks Win32 APIs like CreateProcess:
++# https://crbug.com/368070343#comment29
++rust_allocator_uses_aligned_malloc = false
++if (!rust_allocator_uses_partition_alloc && is_win && is_asan) {
++ rust_allocator_uses_aligned_malloc = true
++}
++
++rust_allocator_uses_allocator_impls_h =
++ rust_allocator_uses_partition_alloc || rust_allocator_uses_aligned_malloc
++
++buildflag_header("buildflags") {
++ header = "buildflags.h"
++ flags = [
++ "RUST_ALLOCATOR_USES_PARTITION_ALLOC=$rust_allocator_uses_partition_alloc",
++ "RUST_ALLOCATOR_USES_ALIGNED_MALLOC=$rust_allocator_uses_aligned_malloc",
++ ]
++ visibility = [ ":*" ]
++}
++
++if (toolchain_has_rust) {
++ # All targets which depend on Rust code but are not linked by rustc must
++ # depend on this. Usually, this dependency will come from the rust_target() GN
++ # template. However, cargo_crate() does *not* include this dependency so any
++ # C++ targets which directly depend on a cargo_crate() must depend on this.
++ rust_static_library("allocator") {
++ sources = [ "lib.rs" ]
++ crate_root = "lib.rs"
++ cxx_bindings = [ "lib.rs" ]
++
++ deps = [ ":alloc_error_handler_impl" ]
++ if (rust_allocator_uses_allocator_impls_h) {
++ deps += [ ":allocator_impls" ]
++ }
++
++ no_chromium_prelude = true
++ no_allocator_crate = true
++ allow_unsafe = true
++
++ rustflags = []
++ if (rust_allocator_uses_allocator_impls_h) {
++ rustflags += [ "--cfg=rust_allocator_uses_allocator_impls_h" ]
++ cxx_bindings += [ "allocator_impls_ffi.rs" ]
++ sources += [ "allocator_impls_ffi.rs" ]
++ }
++
++ # TODO(https://crbug.com/410596442): Stop using unstable features here.
++ configs -= [ "//build/config/compiler:disallow_unstable_features" ]
++ }
++
++ if (rust_allocator_uses_allocator_impls_h) {
++ static_library("allocator_impls") {
++ public_deps = []
++ if (rust_allocator_uses_partition_alloc) {
++ public_deps +=
++ [ "//base/allocator/partition_allocator:partition_alloc" ]
++ }
++
++ sources = [
++ "allocator_impls.cc",
++ "allocator_impls.h",
++ ]
++ deps = [ ":buildflags" ]
++ visibility = [ ":*" ]
++ }
++ }
++
++ static_library("alloc_error_handler_impl") {
++ sources = [
++ # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
++ # copied from `//base`.
++ # TODO(crbug.com/40279749): Avoid duplication / reuse code.
++ "alias.cc",
++ "alias.h",
++ "alloc_error_handler_impl.cc",
++ "alloc_error_handler_impl.h",
++ "compiler_specific.h",
++ "immediate_crash.h",
++ ]
++ visibility = [ ":*" ]
++ }
++}
diff --git a/www/iridium/files/patch-build_rust_allocator_DEPS b/www/iridium/files/patch-build_rust_allocator_DEPS
new file mode 100644
index 000000000000..74bb2d6c2421
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_DEPS
@@ -0,0 +1,12 @@
+--- build/rust/allocator/DEPS.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/DEPS
+@@ -0,0 +1,9 @@
++include_rules = [
++ "-base",
++]
++
++specific_include_rules = {
++ "allocator_impls.cc" : [
++ "+partition_alloc"
++ ]
++}
diff --git a/www/iridium/files/patch-build_rust_allocator_alias.cc b/www/iridium/files/patch-build_rust_allocator_alias.cc
new file mode 100644
index 000000000000..5280641f27e1
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_alias.cc
@@ -0,0 +1,25 @@
+--- build/rust/allocator/alias.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alias.cc
+@@ -0,0 +1,22 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/debug/alias.cc ( additionally the APIs
++// were moved into the `build_rust_std` namespace).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#include "build/rust/allocator/alias.h"
++
++#include "build/rust/allocator/compiler_specific.h"
++
++namespace build_rust_std {
++namespace debug {
++
++// This file/function should be excluded from LTO/LTCG to ensure that the
++// compiler can't see this function's implementation when compiling calls to it.
++NOINLINE void Alias(const void* var) {}
++
++} // namespace debug
++} // namespace build_rust_std
diff --git a/www/iridium/files/patch-build_rust_allocator_alias.h b/www/iridium/files/patch-build_rust_allocator_alias.h
new file mode 100644
index 000000000000..6530c6ae8779
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_alias.h
@@ -0,0 +1,40 @@
+--- build/rust/allocator/alias.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alias.h
+@@ -0,0 +1,37 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/debug/alias.h (and then trimmed to just
++// the APIs / macros needed by //build/rust/std; additionally the APIs were
++// moved into the `build_rust_std` namespace).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALIAS_H_
++#define BUILD_RUST_ALLOCATOR_ALIAS_H_
++
++#include <stddef.h>
++
++namespace build_rust_std {
++namespace debug {
++
++// Make the optimizer think that |var| is aliased. This can be used to prevent a
++// local variable from being optimized out (which is something that
++// `NO_CODE_FOLDING` macro definition below depends on). See
++// //base/debug/alias.h for more details.
++void Alias(const void* var);
++
++} // namespace debug
++
++} // namespace build_rust_std
++
++// Prevent code folding (where a linker identifies functions that are
++// bit-identical and overlays them, which saves space but it leads to confusing
++// call stacks because multiple symbols are at the same address). See
++// //base/debug/alias.h for more details.
++#define NO_CODE_FOLDING() \
++ const int line_number = __LINE__; \
++ build_rust_std::debug::Alias(&line_number)
++
++#endif // BUILD_RUST_ALLOCATOR_ALIAS_H_
diff --git a/www/iridium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc b/www/iridium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc
new file mode 100644
index 000000000000..048c267abefa
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc
@@ -0,0 +1,20 @@
+--- build/rust/allocator/alloc_error_handler_impl.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alloc_error_handler_impl.cc
+@@ -0,0 +1,17 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "build/rust/allocator/alloc_error_handler_impl.h"
++
++#include "build/rust/allocator/alias.h"
++#include "build/rust/allocator/immediate_crash.h"
++
++namespace rust_allocator_internal {
++
++void alloc_error_handler_impl() {
++ NO_CODE_FOLDING();
++ IMMEDIATE_CRASH();
++}
++
++} // namespace rust_allocator_internal
diff --git a/www/iridium/files/patch-build_rust_allocator_alloc__error__handler__impl.h b/www/iridium/files/patch-build_rust_allocator_alloc__error__handler__impl.h
new file mode 100644
index 000000000000..887ea602b027
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_alloc__error__handler__impl.h
@@ -0,0 +1,24 @@
+--- build/rust/allocator/alloc_error_handler_impl.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alloc_error_handler_impl.h
+@@ -0,0 +1,21 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
++#define BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
++
++// This header exposes to Rust a C++ implementation of quickly crashing after an
++// allocation error. (The API below is called from `__rust_alloc_error_handler`
++// in `lib.rs`.)
++//
++// TODO(lukasza): Investigate if we can delete this `.h` / `.cc` and just call
++// `std::process::abort()` (or something else?) directly from `.rs`. The main
++// open question is how much we care about `NO_CODE_FOLDING`.
++namespace rust_allocator_internal {
++
++void alloc_error_handler_impl();
++
++} // namespace rust_allocator_internal
++
++#endif // BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
diff --git a/www/iridium/files/patch-build_rust_allocator_allocator__impls.cc b/www/iridium/files/patch-build_rust_allocator_allocator__impls.cc
new file mode 100644
index 000000000000..94e04d7b966a
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_allocator__impls.cc
@@ -0,0 +1,108 @@
+--- build/rust/allocator/allocator_impls.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls.cc
+@@ -0,0 +1,105 @@
++// Copyright 2021 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "build/rust/allocator/allocator_impls.h"
++
++#ifdef UNSAFE_BUFFERS_BUILD
++// TODO(crbug.com/390223051): Remove C-library calls to fix the errors.
++#pragma allow_unsafe_libc_calls
++#endif
++
++#include <cstddef>
++#include <cstring>
++
++#include "build/build_config.h"
++#include "build/rust/allocator/buildflags.h"
++
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++#include "partition_alloc/partition_alloc_constants.h" // nogncheck
++#include "partition_alloc/shim/allocator_shim.h" // nogncheck
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++#include <cstdlib>
++#endif
++
++namespace rust_allocator_internal {
++
++unsigned char* alloc(size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ // PartitionAlloc will crash if given an alignment larger than this.
++ if (align > partition_alloc::internal::kMaxSupportedAlignment) {
++ return nullptr;
++ }
++
++ // We use unchecked allocation paths in PartitionAlloc rather than going
++ // through its shims in `malloc()` etc so that we can support fallible
++ // allocation paths such as Vec::try_reserve without crashing on allocation
++ // failure.
++ if (align <= alignof(std::max_align_t)) {
++ return static_cast<unsigned char*>(allocator_shim::UncheckedAlloc(size));
++ } else {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedAlignedAlloc(size, align));
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return static_cast<unsigned char*>(_aligned_malloc(size, align));
++#else
++#error This configuration is not supported.
++#endif
++}
++
++void dealloc(unsigned char* p, size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ if (align <= alignof(std::max_align_t)) {
++ allocator_shim::UncheckedFree(p);
++ } else {
++ allocator_shim::UncheckedAlignedFree(p);
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return _aligned_free(p);
++#else
++#error This configuration is not supported.
++#endif
++}
++
++unsigned char* realloc(unsigned char* p,
++ size_t old_size,
++ size_t align,
++ size_t new_size) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ // We use unchecked allocation paths in PartitionAlloc rather than going
++ // through its shims in `malloc()` etc so that we can support fallible
++ // allocation paths such as Vec::try_reserve without crashing on allocation
++ // failure.
++ if (align <= alignof(std::max_align_t)) {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedRealloc(p, new_size));
++ } else {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedAlignedRealloc(p, new_size, align));
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return static_cast<unsigned char*>(_aligned_realloc(p, new_size, align));
++#else
++#error This configuration is not supported.
++#endif
++}
++
++unsigned char* alloc_zeroed(size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC) || \
++ BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ // TODO(danakj): When RUST_ALLOCATOR_USES_PARTITION_ALLOC is true, it's
++ // possible that a partition_alloc::UncheckedAllocZeroed() call would perform
++ // better than partition_alloc::UncheckedAlloc() + memset. But there is no
++ // such API today. See b/342251590.
++ unsigned char* p = alloc(size, align);
++ if (p) {
++ memset(p, 0, size);
++ }
++ return p;
++#else
++#error This configuration is not supported.
++#endif
++}
++
++} // namespace rust_allocator_internal
diff --git a/www/iridium/files/patch-build_rust_allocator_allocator__impls.h b/www/iridium/files/patch-build_rust_allocator_allocator__impls.h
new file mode 100644
index 000000000000..9249cdc938d2
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_allocator__impls.h
@@ -0,0 +1,27 @@
+--- build/rust/allocator/allocator_impls.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls.h
+@@ -0,0 +1,24 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
++#define BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
++
++#include <cstddef>
++
++// This header exposes a C++ allocator (e.g. PartitionAlloc) to Rust.
++// The APIs below are called from `impl GlobalAlloc` in `lib.rs`.
++namespace rust_allocator_internal {
++
++unsigned char* alloc(size_t size, size_t align);
++void dealloc(unsigned char* p, size_t size, size_t align);
++unsigned char* realloc(unsigned char* p,
++ size_t old_size,
++ size_t align,
++ size_t new_size);
++unsigned char* alloc_zeroed(size_t size, size_t align);
++
++} // namespace rust_allocator_internal
++
++#endif // BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
diff --git a/www/iridium/files/patch-build_rust_allocator_allocator__impls__ffi.rs b/www/iridium/files/patch-build_rust_allocator_allocator__impls__ffi.rs
new file mode 100644
index 000000000000..8f0baf1576ce
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_allocator__impls__ffi.rs
@@ -0,0 +1,22 @@
+--- build/rust/allocator/allocator_impls_ffi.rs.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls_ffi.rs
+@@ -0,0 +1,19 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++//! FFI for `allocator_impls.h` is in a separate `.rs` file/module to
++//! better support conditional compilation (these functions are only
++//! used under `#[cfg(rust_allocator_uses_allocator_impls_h)]`.
++
++#[cxx::bridge(namespace = "rust_allocator_internal")]
++pub mod ffi {
++ extern "C++" {
++ include!("build/rust/allocator/allocator_impls.h");
++
++ unsafe fn alloc(size: usize, align: usize) -> *mut u8;
++ unsafe fn dealloc(p: *mut u8, size: usize, align: usize);
++ unsafe fn realloc(p: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8;
++ unsafe fn alloc_zeroed(size: usize, align: usize) -> *mut u8;
++ }
++}
diff --git a/www/iridium/files/patch-build_rust_allocator_compiler__specific.h b/www/iridium/files/patch-build_rust_allocator_compiler__specific.h
new file mode 100644
index 000000000000..7feb0c739d79
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_compiler__specific.h
@@ -0,0 +1,41 @@
+--- build/rust/allocator/compiler_specific.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/compiler_specific.h
+@@ -0,0 +1,38 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/compiler_specific.h (and then
++// significantly trimmed to just the APIs / macros needed by //build/rust/std).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
++#define BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
++
++#include "build/build_config.h"
++
++#if defined(COMPILER_MSVC) && !defined(__clang__)
++#error "Only clang-cl is supported on Windows, see https://crbug.com/988071"
++#endif
++
++#if defined(__has_attribute)
++#define HAS_ATTRIBUTE(x) __has_attribute(x)
++#else
++#define HAS_ATTRIBUTE(x) 0
++#endif
++
++// Annotate a function indicating it should not be inlined.
++// Use like:
++// NOINLINE void DoStuff() { ... }
++#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
++#define NOINLINE [[clang::noinline]]
++#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
++#define NOINLINE __attribute__((noinline))
++#elif defined(COMPILER_MSVC)
++#define NOINLINE __declspec(noinline)
++#else
++#define NOINLINE
++#endif
++
++#endif // BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
diff --git a/www/iridium/files/patch-build_rust_allocator_immediate__crash.h b/www/iridium/files/patch-build_rust_allocator_immediate__crash.h
new file mode 100644
index 000000000000..7ab0f9d9c34c
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_immediate__crash.h
@@ -0,0 +1,174 @@
+--- build/rust/allocator/immediate_crash.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/immediate_crash.h
+@@ -0,0 +1,171 @@
++// Copyright 2021 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/immediate_crash.h.
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
++#define BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
++
++#include "build/build_config.h"
++
++// Crashes in the fastest possible way with no attempt at logging.
++// There are several constraints; see http://crbug.com/664209 for more context.
++//
++// - TRAP_SEQUENCE_() must be fatal. It should not be possible to ignore the
++// resulting exception or simply hit 'continue' to skip over it in a debugger.
++// - Different instances of TRAP_SEQUENCE_() must not be folded together, to
++// ensure crash reports are debuggable. Unlike __builtin_trap(), asm volatile
++// blocks will not be folded together.
++// Note: TRAP_SEQUENCE_() previously required an instruction with a unique
++// nonce since unlike clang, GCC folds together identical asm volatile
++// blocks.
++// - TRAP_SEQUENCE_() must produce a signal that is distinct from an invalid
++// memory access.
++// - TRAP_SEQUENCE_() must be treated as a set of noreturn instructions.
++// __builtin_unreachable() is used to provide that hint here. clang also uses
++// this as a heuristic to pack the instructions in the function epilogue to
++// improve code density.
++//
++// Additional properties that are nice to have:
++// - TRAP_SEQUENCE_() should be as compact as possible.
++// - The first instruction of TRAP_SEQUENCE_() should not change, to avoid
++// shifting crash reporting clusters. As a consequence of this, explicit
++// assembly is preferred over intrinsics.
++// Note: this last bullet point may no longer be true, and may be removed in
++// the future.
++
++// Note: TRAP_SEQUENCE Is currently split into two macro helpers due to the fact
++// that clang emits an actual instruction for __builtin_unreachable() on certain
++// platforms (see https://crbug.com/958675). In addition, the int3/bkpt/brk will
++// be removed in followups, so splitting it up like this now makes it easy to
++// land the followups.
++
++#if defined(COMPILER_GCC)
++
++#if BUILDFLAG(IS_NACL)
++
++// Crash report accuracy is not guaranteed on NaCl.
++#define TRAP_SEQUENCE1_() __builtin_trap()
++#define TRAP_SEQUENCE2_() asm volatile("")
++
++#elif defined(ARCH_CPU_X86_FAMILY)
++
++// TODO(crbug.com/40625592): In theory, it should be possible to use just
++// int3. However, there are a number of crashes with SIGILL as the exception
++// code, so it seems likely that there's a signal handler that allows execution
++// to continue after SIGTRAP.
++#define TRAP_SEQUENCE1_() asm volatile("int3")
++
++#if BUILDFLAG(IS_APPLE)
++// Intentionally empty: __builtin_unreachable() is always part of the sequence
++// (see IMMEDIATE_CRASH below) and already emits a ud2 on Mac.
++#define TRAP_SEQUENCE2_() asm volatile("")
++#else
++#define TRAP_SEQUENCE2_() asm volatile("ud2")
++#endif // BUILDFLAG(IS_APPLE)
++
++#elif defined(ARCH_CPU_ARMEL)
++
++// bkpt will generate a SIGBUS when running on armv7 and a SIGTRAP when running
++// as a 32 bit userspace app on arm64. There doesn't seem to be any way to
++// cause a SIGTRAP from userspace without using a syscall (which would be a
++// problem for sandboxing).
++// TODO(crbug.com/40625592): Remove bkpt from this sequence.
++#define TRAP_SEQUENCE1_() asm volatile("bkpt #0")
++#define TRAP_SEQUENCE2_() asm volatile("udf #0")
++
++#elif defined(ARCH_CPU_ARM64)
++
++// This will always generate a SIGTRAP on arm64.
++// TODO(crbug.com/40625592): Remove brk from this sequence.
++#define TRAP_SEQUENCE1_() asm volatile("brk #0")
++#define TRAP_SEQUENCE2_() asm volatile("hlt #0")
++
++#else
++
++// Crash report accuracy will not be guaranteed on other architectures, but at
++// least this will crash as expected.
++#define TRAP_SEQUENCE1_() __builtin_trap()
++#define TRAP_SEQUENCE2_() asm volatile("")
++
++#endif // ARCH_CPU_*
++
++#elif defined(COMPILER_MSVC)
++
++#if !defined(__clang__)
++
++// MSVC x64 doesn't support inline asm, so use the MSVC intrinsic.
++#define TRAP_SEQUENCE1_() __debugbreak()
++#define TRAP_SEQUENCE2_()
++
++#elif defined(ARCH_CPU_ARM64)
++
++// Windows ARM64 uses "BRK #F000" as its breakpoint instruction, and
++// __debugbreak() generates that in both VC++ and clang.
++#define TRAP_SEQUENCE1_() __debugbreak()
++// Intentionally empty: __builtin_unreachable() is always part of the sequence
++// (see IMMEDIATE_CRASH below) and already emits a ud2 on Win64,
++// https://crbug.com/958373
++#define TRAP_SEQUENCE2_() __asm volatile("")
++
++#else
++
++#define TRAP_SEQUENCE1_() asm volatile("int3")
++#define TRAP_SEQUENCE2_() asm volatile("ud2")
++
++#endif // __clang__
++
++#else
++
++#error No supported trap sequence!
++
++#endif // COMPILER_GCC
++
++#define TRAP_SEQUENCE_() \
++ do { \
++ TRAP_SEQUENCE1_(); \
++ TRAP_SEQUENCE2_(); \
++ } while (false)
++
++// CHECK() and the trap sequence can be invoked from a constexpr function.
++// This could make compilation fail on GCC, as it forbids directly using inline
++// asm inside a constexpr function. However, it allows calling a lambda
++// expression including the same asm.
++// The side effect is that the top of the stacktrace will not point to the
++// calling function, but to this anonymous lambda. This is still useful as the
++// full name of the lambda will typically include the name of the function that
++// calls CHECK() and the debugger will still break at the right line of code.
++#if !defined(COMPILER_GCC) || defined(__clang__)
++
++#define WRAPPED_TRAP_SEQUENCE_() TRAP_SEQUENCE_()
++
++#else
++
++#define WRAPPED_TRAP_SEQUENCE_() \
++ do { \
++ [] { TRAP_SEQUENCE_(); }(); \
++ } while (false)
++
++#endif // !defined(COMPILER_GCC) || defined(__clang__)
++
++#if defined(__clang__) || defined(COMPILER_GCC)
++
++// __builtin_unreachable() hints to the compiler that this is noreturn and can
++// be packed in the function epilogue.
++#define IMMEDIATE_CRASH() \
++ ({ \
++ WRAPPED_TRAP_SEQUENCE_(); \
++ __builtin_unreachable(); \
++ })
++
++#else
++
++// This is supporting non-chromium user of logging.h to build with MSVC, like
++// pdfium. On MSVC there is no __builtin_unreachable().
++#define IMMEDIATE_CRASH() WRAPPED_TRAP_SEQUENCE_()
++
++#endif // defined(__clang__) || defined(COMPILER_GCC)
++
++#endif // BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
diff --git a/www/iridium/files/patch-build_rust_allocator_lib.rs b/www/iridium/files/patch-build_rust_allocator_lib.rs
new file mode 100644
index 000000000000..89fddf278294
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_allocator_lib.rs
@@ -0,0 +1,122 @@
+--- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/lib.rs
+@@ -0,0 +1,119 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++//! Define the allocator that Rust code in Chrome should use.
++//!
++//! Any final artifact that depends on this crate, even transitively, will use
++//! the allocator defined here.
++//!
++//! List of known issues:
++//!
++//! 1. We'd like to use PartitionAlloc on Windows, but the stdlib uses Windows
++//! heap functions directly that PartitionAlloc can not intercept.
++//! 2. We'd like `Vec::try_reserve` to fail at runtime on Linux instead of
++//! crashing in malloc() where PartitionAlloc replaces that function.
++
++// Required to apply weak linkage to symbols.
++//
++// TODO(https://crbug.com/410596442): Stop using unstable features here.
++// https://github.com/rust-lang/rust/issues/29603 tracks stabilization of the `linkage` feature.
++#![feature(linkage)]
++// Required to apply `#[rustc_std_internal_symbol]` to our alloc error handler
++// so the name is correctly mangled as rustc expects.
++//
++// TODO(https://crbug.com/410596442): Stop using internal features here.
++#![allow(internal_features)]
++#![feature(rustc_attrs)]
++
++// This module is in a separate source file to avoid having to teach `cxxbridge`
++// about conditional compilation.
++#[cfg(rust_allocator_uses_allocator_impls_h)]
++mod allocator_impls_ffi;
++
++/// Module that provides `#[global_allocator]` / `GlobalAlloc` interface for
++/// using an allocator from C++.
++#[cfg(rust_allocator_uses_allocator_impls_h)]
++mod cpp_allocator {
++ use super::allocator_impls_ffi::ffi;
++ use std::alloc::{GlobalAlloc, Layout};
++
++ struct Allocator;
++
++ unsafe impl GlobalAlloc for Allocator {
++ unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
++ unsafe { ffi::alloc(layout.size(), layout.align()) }
++ }
++
++ unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
++ unsafe {
++ ffi::dealloc(ptr, layout.size(), layout.align());
++ }
++ }
++
++ unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
++ unsafe { ffi::alloc_zeroed(layout.size(), layout.align()) }
++ }
++
++ unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
++ unsafe { ffi::realloc(ptr, layout.size(), layout.align(), new_size) }
++ }
++ }
++
++ #[global_allocator]
++ static GLOBAL: Allocator = Allocator;
++}
++
++/// Module that provides `#[global_allocator]` / `GlobalAlloc` interface for
++/// using the default Rust allocator.
++#[cfg(not(rust_allocator_uses_allocator_impls_h))]
++mod rust_allocator {
++ #[global_allocator]
++ static GLOBAL: std::alloc::System = std::alloc::System;
++}
++
++/// Module that provides global symbols that are needed both by `cpp_allocator`
++/// and `rust_allocator`.
++///
++/// When `rustc` drives linking, then it will define the symbols below. But
++/// Chromium only uses `rustc` to link Rust-only executables (e.g. `build.rs`
++/// scripts) and otherwise uses a non-Rust linker. This is why we have to
++/// manually define a few symbols below. We define those symbols
++/// as "weak" symbols, so that Rust-provided symbols "win" in case where Rust
++/// actually does drive the linking. This hack works (not only for Chromium,
++/// but also for google3 and other projects), but isn't officially supported by
++/// `rustc`.
++///
++/// TODO(https://crbug.com/410596442): Stop using internal features here.
++mod both_allocators {
++ /// As part of rustc's contract for using `#[global_allocator]` without
++ /// rustc-generated shims we must define this symbol, since we are opting in
++ /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
++ #[no_mangle]
++ #[linkage = "weak"]
++ static __rust_no_alloc_shim_is_unstable: u8 = 0;
++
++ // Mangle the symbol name as rustc expects.
++ #[rustc_std_internal_symbol]
++ #[allow(non_upper_case_globals)]
++ #[linkage = "weak"]
++ static __rust_alloc_error_handler_should_panic: u8 = 0;
++
++ // Mangle the symbol name as rustc expects.
++ #[rustc_std_internal_symbol]
++ #[allow(non_upper_case_globals)]
++ #[linkage = "weak"]
++ fn __rust_alloc_error_handler(_size: usize, _align: usize) {
++ // TODO(lukasza): Investigate if we can just call `std::process::abort()` here.
++ // (Not really _needed_, but it could simplify code a little bit.)
++ unsafe { ffi::alloc_error_handler_impl() }
++ }
++
++ #[cxx::bridge(namespace = "rust_allocator_internal")]
++ mod ffi {
++ extern "C++" {
++ include!("build/rust/allocator/alloc_error_handler_impl.h");
++ unsafe fn alloc_error_handler_impl();
++ }
++ }
++}
diff --git a/www/iridium/files/patch-build_rust_cargo__crate.gni b/www/iridium/files/patch-build_rust_cargo__crate.gni
new file mode 100644
index 000000000000..a1590f727aa3
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_cargo__crate.gni
@@ -0,0 +1,25 @@
+--- build/rust/cargo_crate.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/cargo_crate.gni
+@@ -259,6 +259,12 @@ template("cargo_crate") {
+ # Don't import the `chromium` crate into third-party code.
+ no_chromium_prelude = true
+
++ # Don't depend on the chrome-specific #[global_allocator] crate from
++ # third-party code. This avoids some dependency cycle issues. The allocator
++ # crate will still be used if it exists anywhere in the dependency graph for
++ # a given linked artifact.
++ no_allocator_crate = true
++
+ rustc_metadata = _rustc_metadata
+
+ # TODO(crbug.com/40259764): don't default to true. This requires changes to
+@@ -482,6 +488,9 @@ template("cargo_crate") {
+
+ # Don't import the `chromium` crate into third-party code.
+ no_chromium_prelude = true
++
++ # Build scripts do not need to link to chrome's allocator.
++ no_allocator_crate = true
+
+ # The ${_build_script_name}_output target looks for the exe in this
+ # location. Due to how the Windows component build works, this has to
diff --git a/www/iridium/files/patch-build_rust_rust__macro.gni b/www/iridium/files/patch-build_rust_rust__macro.gni
new file mode 100644
index 000000000000..0dafc3819aa1
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_rust__macro.gni
@@ -0,0 +1,12 @@
+--- build/rust/rust_macro.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/rust_macro.gni
+@@ -16,6 +16,9 @@ template("rust_macro") {
+ forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
+ proc_macro_configs = invoker.configs
+ target_type = "rust_proc_macro"
++
++ # Macros are loaded by rustc and shouldn't use chrome's allocation routines.
++ no_allocator_crate = true
+ }
+ }
+
diff --git a/www/iridium/files/patch-build_rust_rust__target.gni b/www/iridium/files/patch-build_rust_rust__target.gni
new file mode 100644
index 000000000000..f4ad6f04fc45
--- /dev/null
+++ b/www/iridium/files/patch-build_rust_rust__target.gni
@@ -0,0 +1,13 @@
+--- build/rust/rust_target.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/rust_target.gni
+@@ -339,6 +339,10 @@ template("rust_target") {
+ _rust_deps += [ "//build/rust/std" ]
+ }
+
++ if (!defined(invoker.no_allocator_crate) || !invoker.no_allocator_crate) {
++ _rust_deps += [ "//build/rust/allocator" ]
++ }
++
+ if (_build_unit_tests) {
+ _unit_test_target = "${_target_name}_unittests"
+ if (defined(invoker.unit_test_target)) {
diff --git a/www/iridium/files/patch-build_rust_std_BUILD.gn b/www/iridium/files/patch-build_rust_std_BUILD.gn
index d0b722a2cab3..c6c2801bd47d 100644
--- a/www/iridium/files/patch-build_rust_std_BUILD.gn
+++ b/www/iridium/files/patch-build_rust_std_BUILD.gn
@@ -1,6 +1,58 @@
---- build/rust/std/BUILD.gn.orig 2025-05-07 06:48:23 UTC
+--- build/rust/std/BUILD.gn.orig 2025-05-20 09:16:26 UTC
+++ build/rust/std/BUILD.gn
-@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
+@@ -15,51 +15,12 @@
+ # allocator functions to PartitionAlloc when `use_partition_alloc_as_malloc` is
+ # true, so that Rust and C++ use the same allocator backend.
+
+-import("//build/buildflag_header.gni")
+ import("//build/config/compiler/compiler.gni")
+ import("//build/config/coverage/coverage.gni")
+ import("//build/config/rust.gni")
+ import("//build/config/sanitizers/sanitizers.gni")
+
+-rust_allocator_uses_partition_alloc = false
+-if (build_with_chromium) {
+- import("//base/allocator/partition_allocator/partition_alloc.gni")
+- rust_allocator_uses_partition_alloc = use_partition_alloc_as_malloc
+-}
+-
+-buildflag_header("buildflags") {
+- header = "buildflags.h"
+- flags = [
+- "RUST_ALLOCATOR_USES_PARTITION_ALLOC=$rust_allocator_uses_partition_alloc",
+- ]
+- visibility = [ ":*" ]
+-}
+-
+ if (toolchain_has_rust) {
+- # If clang performs the link step, we need to provide the allocator symbols
+- # that are normally injected by rustc during linking.
+- #
+- # We also "happen to" use this to redirect allocations to PartitionAlloc,
+- # though that would be better done through a #[global_allocator] crate (see
+- # above).
+- source_set("remap_alloc") {
+- public_deps = []
+- if (rust_allocator_uses_partition_alloc) {
+- public_deps += [ "//base/allocator/partition_allocator:partition_alloc" ]
+- }
+- deps = [ ":buildflags" ]
+- sources = [
+- # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
+- # copied from `//base`.
+- # TODO(crbug.com/40279749): Avoid duplication / reuse code.
+- "alias.cc",
+- "alias.h",
+- "compiler_specific.h",
+- "immediate_crash.h",
+- "remap_alloc.cc",
+- ]
+- }
+-
+ # List of Rust stdlib rlibs which are present in the official Rust toolchain
+ # we are using from the Android team. This is usually a version or two behind
+ # nightly. Generally this matches the toolchain we build ourselves, but if
+@@ -89,13 +50,20 @@ if (toolchain_has_rust) {
# These are no longer present in the Windows toolchain.
stdlib_files += [
"addr2line",
@@ -22,7 +74,7 @@
}
if (toolchain_for_rust_host_build_tools) {
-@@ -115,7 +122,6 @@ if (toolchain_has_rust) {
+@@ -115,7 +83,6 @@ if (toolchain_has_rust) {
# don't need to pass to the C++ linker because they're used for specialized
# purposes.
skip_stdlib_files = [
@@ -30,3 +82,25 @@
"rustc_std_workspace_alloc",
"rustc_std_workspace_core",
"rustc_std_workspace_std",
+@@ -269,8 +236,6 @@ if (toolchain_has_rust) {
+ foreach(libname, stdlib_files + skip_stdlib_files) {
+ deps += [ "rules:$libname" ]
+ }
+-
+- public_deps = [ ":remap_alloc" ]
+ }
+ } else {
+ action("find_stdlib") {
+@@ -396,12 +361,6 @@ if (toolchain_has_rust) {
+ ":stdlib_public_dependent_libs",
+ ]
+ deps = [ ":prebuilt_rustc_copy_to_sysroot" ]
+-
+- # The host builds tools toolchain supports Rust only and does not use
+- # the allocator remapping to point it to PartitionAlloc.
+- if (!toolchain_for_rust_host_build_tools) {
+- deps += [ ":remap_alloc" ]
+- }
+ }
+ }
+ }
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 4ffb0ebffc40..08dd9c45781c 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,4 +1,4 @@
---- 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.orig 2025-05-15 16:06:59 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -434,7 +434,7 @@
name: "AppTitle",
@@ -45,7 +45,7 @@
status: "stable",
public: true,
base_feature: "none",
-@@ -4636,7 +4636,7 @@
+@@ -4635,7 +4635,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
-@@ -4811,7 +4811,7 @@
+@@ -4810,7 +4810,7 @@
{
name: "WebAppScopeExtensions",
origin_trial_feature_name: "WebAppScopeExtensions",
@@ -63,7 +63,7 @@
status: "experimental",
base_feature: "none",
},
-@@ -5086,7 +5086,7 @@
+@@ -5085,7 +5085,7 @@
{
name: "WebIdentityDigitalCredentials",
origin_trial_feature_name: "WebIdentityDigitalCredentials",
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
new file mode 100644
index 000000000000..e106ca3408e3
--- /dev/null
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
@@ -0,0 +1,13 @@
+--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-05-13 08:59:54 UTC
++++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc
+@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC
+ surface->UpdateBufferDamageRegion(
+ gfx::ToEnclosingRectIgnoringError(surface_damage));
+
++#if !BUILDFLAG(IS_BSD)
+ if (!config.access_fence_handle.is_null())
+ surface->set_acquire_fence(std::move(config.access_fence_handle));
++#endif
+
+ bool needs_commit = false;
+
diff --git a/www/libjwt/Makefile b/www/libjwt/Makefile
index fcba0cbae903..5163274dc86e 100644
--- a/www/libjwt/Makefile
+++ b/www/libjwt/Makefile
@@ -35,6 +35,8 @@ TEST_ARGS= CFLAGS+=-I${LOCALBASE}/include LIBS+="-L${LOCALBASE}/lib -lcheck"
TEST_TARGET= check
USE_LDCONFIG= yes
+PORTSCOUT= limit:^2\.
+
OPTIONS_DEFINE= GNUTLS
GNUTLS_CONFIGURE_WITH= gnutls
diff --git a/www/librewolf/Makefile b/www/librewolf/Makefile
index ebd4edfe5e19..e4f0bb300adb 100644
--- a/www/librewolf/Makefile
+++ b/www/librewolf/Makefile
@@ -1,8 +1,7 @@
PORTNAME= librewolf
-DISTVERSION= 138.0.1
-LWPATCH= -2
+DISTVERSION= 138.0.4
+LWPATCH= -1
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 31195b372818..f9f8c30042a3 100644
--- a/www/librewolf/distinfo
+++ b/www/librewolf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746445113
-SHA256 (librewolf-138.0.1-2.source.tar.gz) = 308ac7a2d890bb798d3058dcf89415ccfb37e80e951f141b13c2ca98a758efd2
-SIZE (librewolf-138.0.1-2.source.tar.gz) = 1019041631
+TIMESTAMP = 1747577982
+SHA256 (librewolf-138.0.4-1.source.tar.gz) = b63081971871154cf115ef3f237e865c2c1358c7086c3ff71c21918d4f343e9f
+SIZE (librewolf-138.0.4-1.source.tar.gz) = 1018411007
diff --git a/www/linux-vieb/Makefile b/www/linux-vieb/Makefile
index aad6a028d354..40c51bd028df 100644
--- a/www/linux-vieb/Makefile
+++ b/www/linux-vieb/Makefile
@@ -1,6 +1,6 @@
PORTNAME= vieb
-DISTVERSION= 12.2.0
-PORTREVISION= 2
+DISTVERSION= 12.3.0
+PORTREVISION= 0
CATEGORIES= www linux
MASTER_SITES= https://github.com/Jelmerro/Vieb/releases/download/${DISTVERSION}/ \
LOCAL/nivit/${PORTNAME}/:images
diff --git a/www/linux-vieb/distinfo b/www/linux-vieb/distinfo
index 218dddb7c86f..898c5d3e1df7 100644
--- a/www/linux-vieb/distinfo
+++ b/www/linux-vieb/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1738773707
-SHA256 (vieb-12.2.0.tar.gz) = dfe1ab70227adbfbcf9e845fbc92596377827d164db48b0533ddf038934fbb08
-SIZE (vieb-12.2.0.tar.gz) = 105202556
-SHA256 (vieb-images-12.2.0.tar.gz) = 5102ff85d837acdf914a0c459367b74c337969096f9f202e1f91ce1b5a6b2d9b
-SIZE (vieb-images-12.2.0.tar.gz) = 970027
+TIMESTAMP = 1747147993
+SHA256 (vieb-12.3.0.tar.gz) = 68aaf4bd9dcfa242e5f6ab46a529601262325e5ee82d392181eb7228e9dc8a5e
+SIZE (vieb-12.3.0.tar.gz) = 110829778
+SHA256 (vieb-images-12.3.0.tar.gz) = 78768881d33d2016153e0c5be54b52cd08aed685b4d577e1b9c5f07a50421b42
+SIZE (vieb-images-12.3.0.tar.gz) = 968923
diff --git a/www/llhttp/Makefile b/www/llhttp/Makefile
index 4e20cced5994..fa55cfdca540 100644
--- a/www/llhttp/Makefile
+++ b/www/llhttp/Makefile
@@ -1,5 +1,5 @@
PORTNAME= llhttp
-PORTVERSION= 9.2.1
+PORTVERSION= 9.3.0
DISTVERSIONPREFIX= release/v
CATEGORIES= www
diff --git a/www/llhttp/distinfo b/www/llhttp/distinfo
index 66b7333f71d5..b4d69889b1b1 100644
--- a/www/llhttp/distinfo
+++ b/www/llhttp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1712330571
-SHA256 (nodejs-llhttp-release-v9.2.1_GH0.tar.gz) = 3c163891446e529604b590f9ad097b2e98b5ef7e4d3ddcf1cf98b62ca668f23e
-SIZE (nodejs-llhttp-release-v9.2.1_GH0.tar.gz) = 37786
+TIMESTAMP = 1747546438
+SHA256 (nodejs-llhttp-release-v9.3.0_GH0.tar.gz) = 1a2b45cb8dda7082b307d336607023aa65549d6f060da1d246b1313da22b685a
+SIZE (nodejs-llhttp-release-v9.3.0_GH0.tar.gz) = 39119
diff --git a/www/llhttp/files/patch-CMakeLists.txt b/www/llhttp/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..407e602780c2
--- /dev/null
+++ b/www/llhttp/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig 2025-05-03 17:04:09 UTC
++++ CMakeLists.txt
+@@ -92,9 +92,7 @@ if(BUILD_STATIC_LIBS)
+ add_library(llhttp_static STATIC
+ ${llhttp_src}
+ )
+- if(BUILD_SHARED_LIBS)
+- add_library(llhttp::llhttp ALIAS llhttp_shared)
+- else()
++ if(NOT BUILD_SHARED_LIBS)
+ add_library(llhttp::llhttp ALIAS llhttp_static)
+ endif()
+ config_library(llhttp_static)
diff --git a/www/llhttp/pkg-plist b/www/llhttp/pkg-plist
index 6d0b1781dd11..b233872aece6 100644
--- a/www/llhttp/pkg-plist
+++ b/www/llhttp/pkg-plist
@@ -3,6 +3,6 @@ lib/cmake/llhttp/llhttp-config-%%CMAKE_BUILD_TYPE%%.cmake
lib/cmake/llhttp/llhttp-config.cmake
%%STATIC%%lib/libllhttp.a
lib/libllhttp.so
-lib/libllhttp.so.9.2
+lib/libllhttp.so.9.3
lib/libllhttp.so.%%PORTVERSION%%
libdata/pkgconfig/libllhttp.pc
diff --git a/www/moin2/Makefile b/www/moin2/Makefile
index f9cfdc0b4cf6..73c81803afa8 100644
--- a/www/moin2/Makefile
+++ b/www/moin2/Makefile
@@ -4,7 +4,7 @@ CATEGORIES= www python
MASTER_SITES= https://github.com/moinwiki/moin/releases/download/${DISTVERSION}/
PKGNAMESUFFIX= 2
-MAINTAINER= bofh@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Easy to use, full-featured and extensible wiki software package
WWW= https://moinmo.in/
diff --git a/www/nextcloud-appointments/Makefile b/www/nextcloud-appointments/Makefile
index 251b0f2a29de..0a65342e1a21 100644
--- a/www/nextcloud-appointments/Makefile
+++ b/www/nextcloud-appointments/Makefile
@@ -1,5 +1,5 @@
PORTNAME= appointments
-PORTVERSION= 2.4.3
+PORTVERSION= 2.4.4
CATEGORIES= www
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/raw/${DISTVERSIONPREFIX}${DISTVERSION}/build/artifacts/appstore/
DISTVERSIONPREFIX= v
diff --git a/www/nextcloud-appointments/distinfo b/www/nextcloud-appointments/distinfo
index 9305ffefff03..b078a88d6d6f 100644
--- a/www/nextcloud-appointments/distinfo
+++ b/www/nextcloud-appointments/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743615391
-SHA256 (nextcloud/appointments-2.4.3/appointments.tar.gz) = 96cd6b2e7b17ed4f70a365a412dce1aef9624dc59497a2d65e8944ffd7ad27bf
-SIZE (nextcloud/appointments-2.4.3/appointments.tar.gz) = 2206164
+TIMESTAMP = 1747764016
+SHA256 (nextcloud/appointments-2.4.4/appointments.tar.gz) = 6b18195db34424edf4dbeab02f83710d19813251c5674f793168935c448b45d5
+SIZE (nextcloud/appointments-2.4.4/appointments.tar.gz) = 2215489
diff --git a/www/nextcloud-calendar/Makefile b/www/nextcloud-calendar/Makefile
index bbeb3d79b07d..84a890b3afb5 100644
--- a/www/nextcloud-calendar/Makefile
+++ b/www/nextcloud-calendar/Makefile
@@ -1,5 +1,5 @@
PORTNAME= calendar
-PORTVERSION= 5.2.2
+PORTVERSION= 5.2.4
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/nextcloud-calendar/distinfo b/www/nextcloud-calendar/distinfo
index 2ff5e0e05b9e..63fe37edd4ed 100644
--- a/www/nextcloud-calendar/distinfo
+++ b/www/nextcloud-calendar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745776569
-SHA256 (nextcloud/calendar-v5.2.2.tar.gz) = ee4390264635c9734817b240068dd86015e527d2dc1076c7244a5db6dd0e2add
-SIZE (nextcloud/calendar-v5.2.2.tar.gz) = 19707542
+TIMESTAMP = 1747333671
+SHA256 (nextcloud/calendar-v5.2.4.tar.gz) = cff04c29acbd163f9a232a4f03d71b109e9d701d37a063e1cb64d218725e473d
+SIZE (nextcloud/calendar-v5.2.4.tar.gz) = 19795163
diff --git a/www/nextcloud-contacts/Makefile b/www/nextcloud-contacts/Makefile
index 95f44662bbe9..328bd28a0f86 100644
--- a/www/nextcloud-contacts/Makefile
+++ b/www/nextcloud-contacts/Makefile
@@ -1,5 +1,5 @@
PORTNAME= contacts
-PORTVERSION= 7.0.6
+PORTVERSION= 7.1.0
DISTVERSIONPREFIX= v
CATEGORIES= www
diff --git a/www/nextcloud-contacts/distinfo b/www/nextcloud-contacts/distinfo
index 6b3df11045b3..c15f6bcd93a0 100644
--- a/www/nextcloud-contacts/distinfo
+++ b/www/nextcloud-contacts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745079799
-SHA256 (nextcloud/contacts-v7.0.6.tar.gz) = dc6d5d8bf3e738020c2f6bf02a0966b8c029be7f3e9d762376a9f24924a82c32
-SIZE (nextcloud/contacts-v7.0.6.tar.gz) = 4327344
+TIMESTAMP = 1747333704
+SHA256 (nextcloud/contacts-v7.1.0.tar.gz) = 39839b18810056204c59eb0bfe436fe051ceed249aef7add563925c2ec8f4ab6
+SIZE (nextcloud/contacts-v7.1.0.tar.gz) = 4354560
diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile
index aeac60e9b5de..0c9d210db4d2 100644
--- a/www/nextcloud/Makefile
+++ b/www/nextcloud/Makefile
@@ -1,5 +1,5 @@
PORTNAME= nextcloud
-PORTVERSION= 31.0.4
+PORTVERSION= 31.0.5
CATEGORIES= www
MASTER_SITES= https://download.nextcloud.com/server/releases/
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
diff --git a/www/nextcloud/distinfo b/www/nextcloud/distinfo
index 68bc03dbd0bb..97eb88f9a750 100644
--- a/www/nextcloud/distinfo
+++ b/www/nextcloud/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745150519
-SHA256 (nextcloud/nextcloud-31.0.4.tar.bz2) = a47541566d5c6ac6f63e4f617e27da295156da47daa2cd22eee3400fd2ad1251
-SIZE (nextcloud/nextcloud-31.0.4.tar.bz2) = 227351477
+TIMESTAMP = 1747332904
+SHA256 (nextcloud/nextcloud-31.0.5.tar.bz2) = 2228b8f524dcd87f08a2a9281d41b04f5cb500b7624bc8c8e07b8e3039061503
+SIZE (nextcloud/nextcloud-31.0.5.tar.bz2) = 226737152
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 6227bc7cc9a7..0bc9b585b4ab 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,6 +1,6 @@
PORTNAME?= nginx
PORTVERSION= 1.28.0
-PORTREVISION= 2
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL= nginx
PORTSCOUT= limit:^1\.2[8-9]\.[0-9]*
-USES= cpe
+USES= cpe compiler:env
CPE_VENDOR= f5
CPE_PRODUCT= nginx
@@ -236,8 +236,8 @@ IGNORE= required at least GSSAPI_HEIMDAL or \
'make config' again
.endif
-.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1305000 && ${OSVERSION} < 1400000)
-CFLAGS+= -Wno-cast-function-type-mismatch
+.if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 191
+CFLAGS+= -Wno-error=cast-function-type-mismatch
.endif
.if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod
index 67b474120360..7011ee65f3f5 100644
--- a/www/nginx-devel/Makefile.extmod
+++ b/www/nginx-devel/Makefile.extmod
@@ -143,10 +143,8 @@ HTTP_PUSH_VARS= DSO_EXTMODS+=push
HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.6.0:pushstream
HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream
-HTTP_REDIS_MASTER_SITES= LOCAL/osa:redis
-HTTP_REDIS_DISTFILES= ngx_http_redis-0.3.9.tar.gz:redis
-HTTP_REDIS_VARS= DSO_EXTDIRS+=ngx_http_redis-0.3.9
-HTTP_REDIS_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-ngx_http_redis_module.c
+HTTP_REDIS_GH_TUPLE= osokin:ngx_http_redis:ad7d90c:redis
+HTTP_REDIS_VARS= DSO_EXTMODS+=redis
HTTP_SLICE_AHEAD_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_http_modules_ngx_http_slice_read_ahead.c
@@ -238,7 +236,7 @@ NAXSI_VARS= DSO_EXTMODS+=naxsi NAXSI_SUBDIR=/naxsi_src
NAXSI_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-naxsi-libinjection__sqli_c \
${PATCHDIR}/extra-patch-naxsi_config
-NJS_GH_TUPLE= nginx:njs:0.8.10:njs
+NJS_GH_TUPLE= nginx:njs:0.9.0:njs
NJS_CONFIGURE_ON= --with-cc-opt="-I ${LOCALBASE}/include/quickjs"
NJS_LIB_DEPENDS= libquickjs.so:lang/quickjs \
libxml2.so:textproc/libxml2 \
diff --git a/www/nginx-devel/distinfo b/www/nginx-devel/distinfo
index 3439d01dff19..558ce00747a7 100644
--- a/www/nginx-devel/distinfo
+++ b/www/nginx-devel/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1746026197
+TIMESTAMP = 1747580329
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 (osokin-ngx_http_redis-ad7d90c_GH0.tar.gz) = 3ac409accbfdc2da2288a37eba8e918b63cad460dab6b29e9f3e7b9823dca744
+SIZE (osokin-ngx_http_redis-ad7d90c_GH0.tar.gz) = 12724
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
@@ -105,8 +105,8 @@ SHA256 (wargio-naxsi-1.7_GH0.tar.gz) = adee817da71913f64a9fb0fca142d9520bb0e5014
SIZE (wargio-naxsi-1.7_GH0.tar.gz) = 1132392
SHA256 (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 7812e1316b61a7a7d3a65a57a07c6d5235ac40fe35e6edda983f31a44661a38e
SIZE (libinjection-libinjection-b9fcaaf_GH0.tar.gz) = 2218207
-SHA256 (nginx-njs-0.8.10_GH0.tar.gz) = 0be4bdd79184cd43f55a0377e59107fddfeef33e54f97c890894f0fe72628d26
-SIZE (nginx-njs-0.8.10_GH0.tar.gz) = 942446
+SHA256 (nginx-njs-0.9.0_GH0.tar.gz) = 7b0446f0b3e0b63b57883e0464d883f0ac4eab82ec7746599d37563dc6808203
+SIZE (nginx-njs-0.9.0_GH0.tar.gz) = 942562
SHA256 (osokin-nginx-otel-3a655df_GH0.tar.gz) = 71ee1561303c289d4562148f8719b60796c36abe16de1b3c10d10b8e6f03a952
SIZE (osokin-nginx-otel-3a655df_GH0.tar.gz) = 27169
SHA256 (konstruxi-ngx_postgres-8aa7359_GH0.tar.gz) = c69ad4495de7c7883ebc23e1e6c4cc83a4ac6a7fddd4d5c12e49d33b65f7c50b
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 6fa332e2032c..f51aaec5b53b 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,6 +1,6 @@
PORTNAME= nginx
PORTVERSION= 1.28.0
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 3
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
diff --git a/www/node18/Makefile b/www/node18/Makefile
index 93dee0754de1..246951a35acb 100644
--- a/www/node18/Makefile
+++ b/www/node18/Makefile
@@ -13,6 +13,8 @@ WWW= https://nodejs.org/ \
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+DEPRECATED= Node.js 18.* has reached its EoL on 2025-04-30. Use Node.js 22.* (www/node22) instead
+EXPIRATION_DATE=2025-05-31
BROKEN_SSL= libressl libressl-devel
BROKEN_SSL_REASON= Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
diff --git a/www/node20/Makefile.version b/www/node20/Makefile.version
index 0155e27fe930..13681b7852b7 100644
--- a/www/node20/Makefile.version
+++ b/www/node20/Makefile.version
@@ -1 +1 @@
-NODEJS_PORTVERSION= 20.19.0
+NODEJS_PORTVERSION= 20.19.2
diff --git a/www/node20/distinfo b/www/node20/distinfo
index 3721358d0a01..66f4fc4a399a 100644
--- a/www/node20/distinfo
+++ b/www/node20/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070284
-SHA256 (node-v20.19.0.tar.xz) = 5ac2516fc905b6a0bc1a33e7302937eac664a820b887cc86bd48c035fba392d7
-SIZE (node-v20.19.0.tar.xz) = 42285100
+TIMESTAMP = 1747546440
+SHA256 (node-v20.19.2.tar.xz) = 4a7ff611d5180f4e420204fa6f22f9f9deb2ac5e98619dd9a4de87edf5b03b6e
+SIZE (node-v20.19.2.tar.xz) = 42289480
diff --git a/www/node20/pkg-message b/www/node20/pkg-message
index ddea08386149..6c7acf5c034a 100644
--- a/www/node20/pkg-message
+++ b/www/node20/pkg-message
@@ -1,7 +1,7 @@
[
{ type: install
message: <<EOM
-Note: If you need npm (Node Package Manager), please install www/npm.
+Note: If you need npm (Node Package Manager), please install www/npm-node20.
EOM
}
]
diff --git a/www/node22/Makefile.version b/www/node22/Makefile.version
index 21be0ceaf6ab..fcb8129e9cb1 100644
--- a/www/node22/Makefile.version
+++ b/www/node22/Makefile.version
@@ -1 +1 @@
-NODEJS_PORTVERSION= 22.14.0
+NODEJS_PORTVERSION= 22.15.1
diff --git a/www/node22/distinfo b/www/node22/distinfo
index 1384f29ae7b9..2f74d09037a0 100644
--- a/www/node22/distinfo
+++ b/www/node22/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739663351
-SHA256 (node-v22.14.0.tar.xz) = c609946bf793b55c7954c26582760808d54c16185d79cb2fb88065e52de21914
-SIZE (node-v22.14.0.tar.xz) = 47753700
+TIMESTAMP = 1747546442
+SHA256 (node-v22.15.1.tar.xz) = c19f0177d21c621746625e5f37590bd0d79a72043b77b53784cba5f145e7263e
+SIZE (node-v22.15.1.tar.xz) = 48443648
diff --git a/www/node22/pkg-message b/www/node22/pkg-message
index ddea08386149..3932e932b18e 100644
--- a/www/node22/pkg-message
+++ b/www/node22/pkg-message
@@ -1,7 +1,7 @@
[
{ type: install
message: <<EOM
-Note: If you need npm (Node Package Manager), please install www/npm.
+Note: If you need npm (Node Package Manager), please install www/npm-node22.
EOM
}
]
diff --git a/www/node23/Makefile b/www/node23/Makefile
index bd3f8a2dcaf2..f56bd755a581 100644
--- a/www/node23/Makefile
+++ b/www/node23/Makefile
@@ -13,6 +13,8 @@ WWW= https://nodejs.org/ \
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
+DEPRECATED= Node.js 23.* will reach its EoL on 2024-06-01. Use Node.js 24.* (www/node24) instead
+EXPIRATION_DATE=2025-06-30
BROKEN_SSL= libressl libressl-devel
BROKEN_SSL_REASON= Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
diff --git a/www/node23/Makefile.version b/www/node23/Makefile.version
index 2942c03add08..43847336b427 100644
--- a/www/node23/Makefile.version
+++ b/www/node23/Makefile.version
@@ -1 +1 @@
-NODEJS_PORTVERSION= 23.11.0
+NODEJS_PORTVERSION= 23.11.1
diff --git a/www/node23/distinfo b/www/node23/distinfo
index 94161220f245..2a9cbcd744dc 100644
--- a/www/node23/distinfo
+++ b/www/node23/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744288760
-SHA256 (node-v23.11.0.tar.xz) = f2c5db21fc5d3c3d78c7e8823bff770cef0da8078c3b5ac4fa6d17d5a41be99d
-SIZE (node-v23.11.0.tar.xz) = 49211772
+TIMESTAMP = 1747546444
+SHA256 (node-v23.11.1.tar.xz) = aef6c67395c328376b665bceefc9d17a06a2961f9a92b93019dff39854d5b2ef
+SIZE (node-v23.11.1.tar.xz) = 48841668
diff --git a/www/node23/pkg-message b/www/node23/pkg-message
index ddea08386149..de6bfcdea756 100644
--- a/www/node23/pkg-message
+++ b/www/node23/pkg-message
@@ -1,7 +1,7 @@
[
{ type: install
message: <<EOM
-Note: If you need npm (Node Package Manager), please install www/npm.
+Note: If you need npm (Node Package Manager), please install www/npm-node23.
EOM
}
]
diff --git a/www/node24/Makefile b/www/node24/Makefile
new file mode 100644
index 000000000000..67d17435d3d7
--- /dev/null
+++ b/www/node24/Makefile
@@ -0,0 +1,104 @@
+PORTNAME= node
+PORTVERSION= ${NODEJS_PORTVERSION}
+DISTVERSIONPREFIX= v
+CATEGORIES= www
+MASTER_SITES= https://nodejs.org/dist/v${PORTVERSION}/
+PKGNAMESUFFIX= ${PORTVERSION:R:R}
+
+MAINTAINER= sunpoet@FreeBSD.org
+COMMENT= V8 JavaScript for client and server
+WWW= https://nodejs.org/ \
+ https://github.com/nodejs/node
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+BROKEN_SSL= libressl libressl-devel
+BROKEN_SSL_REASON= Node.js ${PORTVERSION:R:R}.x requires OpenSSL or the BUNDLED_SSL option enabled
+ONLY_FOR_ARCHS= aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
+
+BUILD_DEPENDS= objdump:devel/binutils
+LIB_DEPENDS= libbrotlidec.so:archivers/brotli \
+ libcares.so:dns/c-ares \
+ libicui18n.so:devel/icu \
+ libnghttp2.so:www/libnghttp2 \
+ libnghttp3.so:www/libnghttp3 \
+ libngtcp2.so:net/libngtcp2 \
+ libsimdjson.so:devel/simdjson \
+ libuv.so:devel/libuv \
+ libzstd.so:archivers/zstd
+
+USES= compiler:c++11-lang gmake localbase pkgconfig python:build shebangfix tar:xz
+
+CONFIGURE_ARGS= --prefix=${PREFIX:S|^${DESTDIR}||} \
+ --shared-brotli \
+ --shared-cares \
+ --shared-libuv \
+ --shared-nghttp2 \
+ --shared-nghttp3 \
+ --shared-ngtcp2 \
+ --shared-simdjson \
+ --shared-zlib \
+ --shared-zstd \
+ --with-intl=system-icu \
+ --without-npm
+HAS_CONFIGURE= yes
+MAKE_ENV= CC.host="${CCACHE_BIN} ${CC}" \
+ CFLAGS.host="${CFLAGS}" \
+ CXX.host="${CCACHE_BIN} ${CXX}" \
+ CXXFLAGS.host="${CXXFLAGS}" \
+ LDFLAGS.host="${LDFLAGS}" \
+ LINK.host="${CXX}"
+REINPLACE_ARGS= -i ''
+
+CONFLICTS_INSTALL= node[0-9][0-9]
+
+SHEBANG_FILES= deps/v8/third_party/inspector_protocol/*.py \
+ deps/v8/tools/*.py \
+ tools/*.py \
+ tools/inspector_protocol/*.py
+
+OPTIONS_DEFINE= BUNDLED_SSL DOCS JIT
+OPTIONS_DEFAULT=JIT
+OPTIONS_SUB= yes
+BUNDLED_SSL_DESC= Use bundled OpenSSL implementation from node.js
+JIT_DESC= Use Just In Time compiler
+
+BUNDLED_SSL_CONFIGURE_OFF= --openssl-use-def-ca-store --shared-openssl
+BUNDLED_SSL_RUN_DEPENDS_OFF= ca_root_nss>=0:security/ca_root_nss
+BUNDLED_SSL_USES_OFF= ssl
+JIT_CONFIGURE_OFF= --v8-lite-mode
+
+.include "Makefile.version"
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MBUNDLED_SSL} && ${ARCH} != amd64
+CONFIGURE_ARGS+=--openssl-no-asm
+.endif
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/tools/v8_gypfiles/v8.gyp
+# Clean up bundled libraries
+ @${RM} -r ${WRKSRC}/deps/brotli/
+ @${RM} -r ${WRKSRC}/deps/cares/
+ @${RM} -r ${WRKSRC}/deps/nghttp2/
+ @${RM} -r ${WRKSRC}/deps/ngtcp2/
+ @${RM} -r ${WRKSRC}/deps/npm/
+ @${RM} -r ${WRKSRC}/deps/simdjson/
+ @${RM} -r ${WRKSRC}/deps/uv/
+ @${RM} -r ${WRKSRC}/deps/zlib/
+ @${RM} -r ${WRKSRC}/deps/zstd/
+
+post-configure:
+ # Post-process Makefile and *.mk files created by node-gyp and remove
+ # all occurrences of -I${LOCALBASE}/include. C*FLAGS include this
+ # before all -I../deps/* for bundled code. This can cause build
+ # breakages if the dependency is installed in ${LOCALBASE}. The
+ # USES+=localbase # above will ensure that we pick up includes for real
+ # external dependencies.
+ ${FIND} ${WRKSRC}/out -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} -e "s|-I${LOCALBASE}/include||g"
+
+post-install:
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/node
+
+.include <bsd.port.mk>
diff --git a/www/node24/Makefile.version b/www/node24/Makefile.version
new file mode 100644
index 000000000000..f0e22b213ad6
--- /dev/null
+++ b/www/node24/Makefile.version
@@ -0,0 +1 @@
+NODEJS_PORTVERSION= 24.0.2
diff --git a/www/node24/distinfo b/www/node24/distinfo
new file mode 100644
index 000000000000..d3bf541a61ca
--- /dev/null
+++ b/www/node24/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1747546446
+SHA256 (node-v24.0.2.tar.xz) = 1597075afc06e5c6145d0bfbd77e2072c2ec0ab71ac4950cf008b2641374cd71
+SIZE (node-v24.0.2.tar.xz) = 49774016
diff --git a/www/node24/files/patch-common.gypi b/www/node24/files/patch-common.gypi
new file mode 100644
index 000000000000..7a6628dd498e
--- /dev/null
+++ b/www/node24/files/patch-common.gypi
@@ -0,0 +1,20 @@
+--- common.gypi.orig 2025-05-06 12:36:27 UTC
++++ common.gypi
+@@ -529,7 +529,7 @@
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'host_arch=="ppc64" and OS not in "aix os400"', {
+- 'cflags': [ '-m64', '-mminimal-toc' ],
++ 'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'host_arch=="s390x" and OS=="linux"', {
+@@ -549,7 +549,7 @@
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'target_arch=="ppc64" and OS not in "aix os400"', {
+- 'cflags': [ '-m64', '-mminimal-toc' ],
++ 'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+ }],
+ [ 'target_arch=="s390x" and OS=="linux"', {
diff --git a/www/node24/files/patch-deps-openssl-openssl-cl_no_asm.gypi b/www/node24/files/patch-deps-openssl-openssl-cl_no_asm.gypi
new file mode 100644
index 000000000000..2670843ea933
--- /dev/null
+++ b/www/node24/files/patch-deps-openssl-openssl-cl_no_asm.gypi
@@ -0,0 +1,17 @@
+--- deps/openssl/openssl-cl_no_asm.gypi.orig 2023-10-24 10:04:40 UTC
++++ deps/openssl/openssl-cl_no_asm.gypi
+@@ -1,4 +1,5 @@
+ {
++ 'defines': ['OPENSSL_NO_ASM'],
+ 'conditions': [
+ ['target_arch=="ppc64" and OS in ("aix", "os400")', {
+ 'includes': ['config/archs/aix64-gcc-as/no-asm/openssl-cl.gypi'],
+@@ -45,7 +46,7 @@
+ 'includes': ['config/archs/linux64-loongarch64/no-asm/openssl-cl.gypi'],
+ }, {
+ # Other architectures don't use assembly
+- 'includes': ['config/archs/linux-x86_64/no-asm/openssl-cl.gypi'],
++ 'includes': ['config/archs/linux-elf/no-asm/openssl-cl.gypi'],
+ }],
+ ],
+ }
diff --git a/www/node24/files/patch-deps-openssl-openssl_no_asm.gypi b/www/node24/files/patch-deps-openssl-openssl_no_asm.gypi
new file mode 100644
index 000000000000..a7f94c9eda31
--- /dev/null
+++ b/www/node24/files/patch-deps-openssl-openssl_no_asm.gypi
@@ -0,0 +1,11 @@
+--- deps/openssl/openssl_no_asm.gypi.orig 2025-05-06 12:36:29 UTC
++++ deps/openssl/openssl_no_asm.gypi
+@@ -46,7 +46,7 @@
+ 'includes': ['config/archs/linux64-loongarch64/no-asm/openssl.gypi'],
+ }, {
+ # Other architectures don't use assembly
+- 'includes': ['config/archs/linux-x86_64/no-asm/openssl.gypi'],
++ 'includes': ['config/archs/linux-elf/no-asm/openssl.gypi'],
+ }],
+ ],
+ }
diff --git a/www/node24/files/patch-deps-v8-src-base-platform-platform-freebsd.cc b/www/node24/files/patch-deps-v8-src-base-platform-platform-freebsd.cc
new file mode 100644
index 000000000000..be89ded1df8d
--- /dev/null
+++ b/www/node24/files/patch-deps-v8-src-base-platform-platform-freebsd.cc
@@ -0,0 +1,13 @@
+--- deps/v8/src/base/platform/platform-freebsd.cc.orig 2023-05-16 06:58:20 UTC
++++ deps/v8/src/base/platform/platform-freebsd.cc
+@@ -82,8 +82,8 @@ std::vector<OS::SharedLibraryAddress> OS::GetSharedLib
+ lib_name = std::string(path);
+ }
+ result.push_back(SharedLibraryAddress(
+- lib_name, reinterpret_cast<uintptr_t>(map->kve_start),
+- reinterpret_cast<uintptr_t>(map->kve_end)));
++ lib_name, static_cast<uintptr_t>(map->kve_start),
++ static_cast<uintptr_t>(map->kve_end)));
+ }
+
+ start += ssize;
diff --git a/www/node24/files/patch-deps-v8-src-codegen-arm-cpu-arm.cc b/www/node24/files/patch-deps-v8-src-codegen-arm-cpu-arm.cc
new file mode 100644
index 000000000000..42fd70bfd7ca
--- /dev/null
+++ b/www/node24/files/patch-deps-v8-src-codegen-arm-cpu-arm.cc
@@ -0,0 +1,18 @@
+--- deps/v8/src/codegen/arm/cpu-arm.cc.orig 2023-05-16 06:58:20 UTC
++++ deps/v8/src/codegen/arm/cpu-arm.cc
+@@ -2,12 +2,15 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include "include/v8config.h"
++
+ // CPU specific code for arm independent of OS goes here.
+ #ifdef __arm__
+ #ifdef __QNXNTO__
+ #include <sys/mman.h> // for cache flushing.
+ #undef MAP_TYPE
+ #elif V8_OS_FREEBSD
++#include <sys/cdefs.h>
+ #include <machine/sysarch.h> // for cache flushing
+ #include <sys/types.h>
+ #elif V8_OS_STARBOARD
diff --git a/www/node24/files/patch-deps-v8-src-codegen-ppc-constants-ppc.h b/www/node24/files/patch-deps-v8-src-codegen-ppc-constants-ppc.h
new file mode 100644
index 000000000000..436f9a7c82be
--- /dev/null
+++ b/www/node24/files/patch-deps-v8-src-codegen-ppc-constants-ppc.h
@@ -0,0 +1,20 @@
+--- deps/v8/src/codegen/ppc/constants-ppc.h.orig 2025-05-06 12:36:30 UTC
++++ deps/v8/src/codegen/ppc/constants-ppc.h
+@@ -35,7 +35,7 @@
+ #define ABI_PASSES_HANDLES_IN_REGS 0
+ #endif
+
+-#if !V8_HOST_ARCH_PPC64 || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN || \
++#if !V8_HOST_ARCH_PPC64 || !V8_TARGET_ARCH_PPC64 || \
+ (defined(_CALL_ELF) && _CALL_ELF == 2)
+ #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
+ #else
+@@ -44,7 +44,7 @@
+
+ #if !V8_HOST_ARCH_PPC64 || \
+ (V8_TARGET_ARCH_PPC64 && \
+- (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
++ (defined(_CALL_ELF) && _CALL_ELF == 2))
+ #define ABI_CALL_VIA_IP 1
+ #else
+ #define ABI_CALL_VIA_IP 0
diff --git a/www/node24/files/patch-deps-v8-src-libsampler-sampler.cc b/www/node24/files/patch-deps-v8-src-libsampler-sampler.cc
new file mode 100644
index 000000000000..463370ea8d6a
--- /dev/null
+++ b/www/node24/files/patch-deps-v8-src-libsampler-sampler.cc
@@ -0,0 +1,13 @@
+--- deps/v8/src/libsampler/sampler.cc.orig 2025-05-06 12:36:30 UTC
++++ deps/v8/src/libsampler/sampler.cc
+@@ -520,6 +520,10 @@ void SignalHandler::FillRegisterState(void* context, R
+ state->pc = reinterpret_cast<void*>(mcontext.__gregs[_REG_PC]);
+ state->sp = reinterpret_cast<void*>(mcontext.__gregs[_REG_SP]);
+ state->fp = reinterpret_cast<void*>(mcontext.__gregs[_REG_FP]);
++#elif V8_TARGET_ARCH_PPC64
++ state->pc = reinterpret_cast<void*>(mcontext.mc_srr0);
++ state->sp = reinterpret_cast<void*>(mcontext.mc_frame[1]);
++ state->fp = reinterpret_cast<void*>(mcontext.mc_frame[31]);
+ #endif // V8_HOST_ARCH_*
+ #elif V8_OS_NETBSD
+ #if V8_HOST_ARCH_IA32
diff --git a/www/node24/files/patch-node.gypi b/www/node24/files/patch-node.gypi
new file mode 100644
index 000000000000..bd2f3dec9ffa
--- /dev/null
+++ b/www/node24/files/patch-node.gypi
@@ -0,0 +1,12 @@
+--- node.gypi.orig 2025-05-06 12:36:33 UTC
++++ node.gypi
+@@ -376,6 +376,9 @@
+ [ 'node_use_openssl=="true"', {
+ 'defines': [ 'HAVE_OPENSSL=1' ],
+ 'conditions': [
++ ['openssl_no_asm==1', {
++ 'defines': [ 'OPENSSL_NO_ASM' ],
++ }],
+ [ 'node_shared_openssl=="false"', {
+ 'defines': [ 'OPENSSL_API_COMPAT=0x10100000L', ],
+ 'dependencies': [
diff --git a/www/node24/files/patch-src-cares_wrap.h b/www/node24/files/patch-src-cares_wrap.h
new file mode 100644
index 000000000000..7bac6f049408
--- /dev/null
+++ b/www/node24/files/patch-src-cares_wrap.h
@@ -0,0 +1,11 @@
+--- src/cares_wrap.h.orig 2023-05-16 06:58:21 UTC
++++ src/cares_wrap.h
+@@ -23,7 +23,7 @@
+ # include <netdb.h>
+ #endif // __POSIX__
+
+-# include <ares_nameser.h>
++# include <arpa/nameser.h>
+
+ namespace node {
+ namespace cares_wrap {
diff --git a/www/node24/pkg-descr b/www/node24/pkg-descr
new file mode 100644
index 000000000000..aed88d828d57
--- /dev/null
+++ b/www/node24/pkg-descr
@@ -0,0 +1,2 @@
+Node.js is a free, open-source, cross-platform JavaScript runtime environment
+that lets developers create servers, web apps, command line tools and scripts.
diff --git a/www/node24/pkg-message b/www/node24/pkg-message
new file mode 100644
index 000000000000..4594af9a47a6
--- /dev/null
+++ b/www/node24/pkg-message
@@ -0,0 +1,7 @@
+[
+{ type: install
+ message: <<EOM
+Note: If you need npm (Node Package Manager), please install www/npm-node24.
+EOM
+}
+]
diff --git a/www/node24/pkg-plist b/www/node24/pkg-plist
new file mode 100644
index 000000000000..d580eb7dd775
--- /dev/null
+++ b/www/node24/pkg-plist
@@ -0,0 +1,2376 @@
+bin/corepack
+bin/node
+include/node/common.gypi
+include/node/config.gypi
+include/node/cppgc/allocation.h
+include/node/cppgc/common.h
+include/node/cppgc/cross-thread-persistent.h
+include/node/cppgc/custom-space.h
+include/node/cppgc/default-platform.h
+include/node/cppgc/explicit-management.h
+include/node/cppgc/garbage-collected.h
+include/node/cppgc/heap-consistency.h
+include/node/cppgc/heap-handle.h
+include/node/cppgc/heap-state.h
+include/node/cppgc/heap-statistics.h
+include/node/cppgc/heap.h
+include/node/cppgc/internal/api-constants.h
+include/node/cppgc/internal/atomic-entry-flag.h
+include/node/cppgc/internal/base-page-handle.h
+include/node/cppgc/internal/caged-heap-local-data.h
+include/node/cppgc/internal/caged-heap.h
+include/node/cppgc/internal/compiler-specific.h
+include/node/cppgc/internal/conditional-stack-allocated.h
+include/node/cppgc/internal/finalizer-trait.h
+include/node/cppgc/internal/gc-info.h
+include/node/cppgc/internal/logging.h
+include/node/cppgc/internal/member-storage.h
+include/node/cppgc/internal/name-trait.h
+include/node/cppgc/internal/persistent-node.h
+include/node/cppgc/internal/pointer-policies.h
+include/node/cppgc/internal/write-barrier.h
+include/node/cppgc/liveness-broker.h
+include/node/cppgc/macros.h
+include/node/cppgc/member.h
+include/node/cppgc/name-provider.h
+include/node/cppgc/object-size-trait.h
+include/node/cppgc/persistent.h
+include/node/cppgc/platform.h
+include/node/cppgc/prefinalizer.h
+include/node/cppgc/process-heap-statistics.h
+include/node/cppgc/sentinel-pointer.h
+include/node/cppgc/source-location.h
+include/node/cppgc/testing.h
+include/node/cppgc/trace-trait.h
+include/node/cppgc/type-traits.h
+include/node/cppgc/visitor.h
+include/node/js_native_api.h
+include/node/js_native_api_types.h
+include/node/libplatform/libplatform-export.h
+include/node/libplatform/libplatform.h
+include/node/libplatform/v8-tracing.h
+include/node/node.h
+include/node/node_api.h
+include/node/node_api_types.h
+include/node/node_buffer.h
+include/node/node_object_wrap.h
+include/node/node_version.h
+%%BUNDLED_SSL%%include/node/openssl/aes.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/BSD-x86_64/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN32/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64-ARM/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/VC-WIN64A/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/aix64-gcc-as/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin-i386-cc/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-arm64-cc/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/darwin64-x86_64-cc/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-aarch64/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-armv4/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-elf/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-ppc64le/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux-x86_64/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux32-s390x/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-mips64/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-riscv64/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/linux64-s390x/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris-x86-gcc/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/asm_avx2/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/crypto/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/crypto/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/include/progs.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/providers/common/include/prov/der_digests.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/providers/common/include/prov/der_dsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/providers/common/include/prov/der_ec.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/providers/common/include/prov/der_ecx.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/providers/common/include/prov/der_rsa.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/providers/common/include/prov/der_sm2.h
+%%BUNDLED_SSL%%include/node/openssl/archs/solaris64-x86_64-gcc/no-asm/providers/common/include/prov/der_wrap.h
+%%BUNDLED_SSL%%include/node/openssl/asn1.h
+%%BUNDLED_SSL%%include/node/openssl/asn1_asm.h
+%%BUNDLED_SSL%%include/node/openssl/asn1_mac.h
+%%BUNDLED_SSL%%include/node/openssl/asn1_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/asn1err.h
+%%BUNDLED_SSL%%include/node/openssl/asn1t.h
+%%BUNDLED_SSL%%include/node/openssl/asn1t_asm.h
+%%BUNDLED_SSL%%include/node/openssl/asn1t_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/async.h
+%%BUNDLED_SSL%%include/node/openssl/asyncerr.h
+%%BUNDLED_SSL%%include/node/openssl/bio.h
+%%BUNDLED_SSL%%include/node/openssl/bio_asm.h
+%%BUNDLED_SSL%%include/node/openssl/bio_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/bioerr.h
+%%BUNDLED_SSL%%include/node/openssl/blowfish.h
+%%BUNDLED_SSL%%include/node/openssl/bn.h
+%%BUNDLED_SSL%%include/node/openssl/bn_conf.h
+%%BUNDLED_SSL%%include/node/openssl/bn_conf_asm.h
+%%BUNDLED_SSL%%include/node/openssl/bn_conf_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/bnerr.h
+%%BUNDLED_SSL%%include/node/openssl/buffer.h
+%%BUNDLED_SSL%%include/node/openssl/buffererr.h
+%%BUNDLED_SSL%%include/node/openssl/camellia.h
+%%BUNDLED_SSL%%include/node/openssl/cast.h
+%%BUNDLED_SSL%%include/node/openssl/cmac.h
+%%BUNDLED_SSL%%include/node/openssl/cmp.h
+%%BUNDLED_SSL%%include/node/openssl/cmp_asm.h
+%%BUNDLED_SSL%%include/node/openssl/cmp_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/cmp_util.h
+%%BUNDLED_SSL%%include/node/openssl/cmperr.h
+%%BUNDLED_SSL%%include/node/openssl/cms.h
+%%BUNDLED_SSL%%include/node/openssl/cms_asm.h
+%%BUNDLED_SSL%%include/node/openssl/cms_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/cmserr.h
+%%BUNDLED_SSL%%include/node/openssl/comp.h
+%%BUNDLED_SSL%%include/node/openssl/comperr.h
+%%BUNDLED_SSL%%include/node/openssl/conf.h
+%%BUNDLED_SSL%%include/node/openssl/conf_api.h
+%%BUNDLED_SSL%%include/node/openssl/conf_asm.h
+%%BUNDLED_SSL%%include/node/openssl/conf_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/conferr.h
+%%BUNDLED_SSL%%include/node/openssl/configuration.h
+%%BUNDLED_SSL%%include/node/openssl/configuration_asm.h
+%%BUNDLED_SSL%%include/node/openssl/configuration_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/conftypes.h
+%%BUNDLED_SSL%%include/node/openssl/core.h
+%%BUNDLED_SSL%%include/node/openssl/core_dispatch.h
+%%BUNDLED_SSL%%include/node/openssl/core_names.h
+%%BUNDLED_SSL%%include/node/openssl/core_object.h
+%%BUNDLED_SSL%%include/node/openssl/crmf.h
+%%BUNDLED_SSL%%include/node/openssl/crmf_asm.h
+%%BUNDLED_SSL%%include/node/openssl/crmf_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/crmferr.h
+%%BUNDLED_SSL%%include/node/openssl/crypto.h
+%%BUNDLED_SSL%%include/node/openssl/crypto_asm.h
+%%BUNDLED_SSL%%include/node/openssl/crypto_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/cryptoerr.h
+%%BUNDLED_SSL%%include/node/openssl/cryptoerr_legacy.h
+%%BUNDLED_SSL%%include/node/openssl/ct.h
+%%BUNDLED_SSL%%include/node/openssl/ct_asm.h
+%%BUNDLED_SSL%%include/node/openssl/ct_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/cterr.h
+%%BUNDLED_SSL%%include/node/openssl/decoder.h
+%%BUNDLED_SSL%%include/node/openssl/decodererr.h
+%%BUNDLED_SSL%%include/node/openssl/des.h
+%%BUNDLED_SSL%%include/node/openssl/dh.h
+%%BUNDLED_SSL%%include/node/openssl/dherr.h
+%%BUNDLED_SSL%%include/node/openssl/dsa.h
+%%BUNDLED_SSL%%include/node/openssl/dsaerr.h
+%%BUNDLED_SSL%%include/node/openssl/dso_conf.h
+%%BUNDLED_SSL%%include/node/openssl/dso_conf_asm.h
+%%BUNDLED_SSL%%include/node/openssl/dso_conf_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/dtls1.h
+%%BUNDLED_SSL%%include/node/openssl/e_os2.h
+%%BUNDLED_SSL%%include/node/openssl/ebcdic.h
+%%BUNDLED_SSL%%include/node/openssl/ec.h
+%%BUNDLED_SSL%%include/node/openssl/ecdh.h
+%%BUNDLED_SSL%%include/node/openssl/ecdsa.h
+%%BUNDLED_SSL%%include/node/openssl/ecerr.h
+%%BUNDLED_SSL%%include/node/openssl/encoder.h
+%%BUNDLED_SSL%%include/node/openssl/encodererr.h
+%%BUNDLED_SSL%%include/node/openssl/engine.h
+%%BUNDLED_SSL%%include/node/openssl/engineerr.h
+%%BUNDLED_SSL%%include/node/openssl/err.h
+%%BUNDLED_SSL%%include/node/openssl/err_asm.h
+%%BUNDLED_SSL%%include/node/openssl/err_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/ess.h
+%%BUNDLED_SSL%%include/node/openssl/ess_asm.h
+%%BUNDLED_SSL%%include/node/openssl/ess_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/esserr.h
+%%BUNDLED_SSL%%include/node/openssl/evp.h
+%%BUNDLED_SSL%%include/node/openssl/evperr.h
+%%BUNDLED_SSL%%include/node/openssl/fips_names.h
+%%BUNDLED_SSL%%include/node/openssl/fipskey.h
+%%BUNDLED_SSL%%include/node/openssl/fipskey_asm.h
+%%BUNDLED_SSL%%include/node/openssl/fipskey_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/hmac.h
+%%BUNDLED_SSL%%include/node/openssl/http.h
+%%BUNDLED_SSL%%include/node/openssl/httperr.h
+%%BUNDLED_SSL%%include/node/openssl/idea.h
+%%BUNDLED_SSL%%include/node/openssl/kdf.h
+%%BUNDLED_SSL%%include/node/openssl/kdferr.h
+%%BUNDLED_SSL%%include/node/openssl/lhash.h
+%%BUNDLED_SSL%%include/node/openssl/lhash_asm.h
+%%BUNDLED_SSL%%include/node/openssl/lhash_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/macros.h
+%%BUNDLED_SSL%%include/node/openssl/md2.h
+%%BUNDLED_SSL%%include/node/openssl/md4.h
+%%BUNDLED_SSL%%include/node/openssl/md5.h
+%%BUNDLED_SSL%%include/node/openssl/mdc2.h
+%%BUNDLED_SSL%%include/node/openssl/modes.h
+%%BUNDLED_SSL%%include/node/openssl/obj_mac.h
+%%BUNDLED_SSL%%include/node/openssl/objects.h
+%%BUNDLED_SSL%%include/node/openssl/objectserr.h
+%%BUNDLED_SSL%%include/node/openssl/ocsp.h
+%%BUNDLED_SSL%%include/node/openssl/ocsp_asm.h
+%%BUNDLED_SSL%%include/node/openssl/ocsp_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/ocsperr.h
+%%BUNDLED_SSL%%include/node/openssl/opensslconf.h
+%%BUNDLED_SSL%%include/node/openssl/opensslconf_asm.h
+%%BUNDLED_SSL%%include/node/openssl/opensslv.h
+%%BUNDLED_SSL%%include/node/openssl/opensslv_asm.h
+%%BUNDLED_SSL%%include/node/openssl/opensslv_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/ossl_typ.h
+%%BUNDLED_SSL%%include/node/openssl/param_build.h
+%%BUNDLED_SSL%%include/node/openssl/params.h
+%%BUNDLED_SSL%%include/node/openssl/pem.h
+%%BUNDLED_SSL%%include/node/openssl/pem2.h
+%%BUNDLED_SSL%%include/node/openssl/pemerr.h
+%%BUNDLED_SSL%%include/node/openssl/pkcs12.h
+%%BUNDLED_SSL%%include/node/openssl/pkcs12_asm.h
+%%BUNDLED_SSL%%include/node/openssl/pkcs12_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/pkcs12err.h
+%%BUNDLED_SSL%%include/node/openssl/pkcs7.h
+%%BUNDLED_SSL%%include/node/openssl/pkcs7_asm.h
+%%BUNDLED_SSL%%include/node/openssl/pkcs7_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/pkcs7err.h
+%%BUNDLED_SSL%%include/node/openssl/prov_ssl.h
+%%BUNDLED_SSL%%include/node/openssl/proverr.h
+%%BUNDLED_SSL%%include/node/openssl/provider.h
+%%BUNDLED_SSL%%include/node/openssl/quic.h
+%%BUNDLED_SSL%%include/node/openssl/rand.h
+%%BUNDLED_SSL%%include/node/openssl/randerr.h
+%%BUNDLED_SSL%%include/node/openssl/rc2.h
+%%BUNDLED_SSL%%include/node/openssl/rc4.h
+%%BUNDLED_SSL%%include/node/openssl/rc5.h
+%%BUNDLED_SSL%%include/node/openssl/ripemd.h
+%%BUNDLED_SSL%%include/node/openssl/rsa.h
+%%BUNDLED_SSL%%include/node/openssl/rsaerr.h
+%%BUNDLED_SSL%%include/node/openssl/safestack.h
+%%BUNDLED_SSL%%include/node/openssl/safestack_asm.h
+%%BUNDLED_SSL%%include/node/openssl/safestack_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/seed.h
+%%BUNDLED_SSL%%include/node/openssl/self_test.h
+%%BUNDLED_SSL%%include/node/openssl/sha.h
+%%BUNDLED_SSL%%include/node/openssl/srp.h
+%%BUNDLED_SSL%%include/node/openssl/srp_asm.h
+%%BUNDLED_SSL%%include/node/openssl/srp_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/srtp.h
+%%BUNDLED_SSL%%include/node/openssl/ssl.h
+%%BUNDLED_SSL%%include/node/openssl/ssl2.h
+%%BUNDLED_SSL%%include/node/openssl/ssl3.h
+%%BUNDLED_SSL%%include/node/openssl/ssl_asm.h
+%%BUNDLED_SSL%%include/node/openssl/ssl_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/sslerr.h
+%%BUNDLED_SSL%%include/node/openssl/sslerr_legacy.h
+%%BUNDLED_SSL%%include/node/openssl/stack.h
+%%BUNDLED_SSL%%include/node/openssl/store.h
+%%BUNDLED_SSL%%include/node/openssl/storeerr.h
+%%BUNDLED_SSL%%include/node/openssl/symhacks.h
+%%BUNDLED_SSL%%include/node/openssl/tls1.h
+%%BUNDLED_SSL%%include/node/openssl/trace.h
+%%BUNDLED_SSL%%include/node/openssl/ts.h
+%%BUNDLED_SSL%%include/node/openssl/tserr.h
+%%BUNDLED_SSL%%include/node/openssl/txt_db.h
+%%BUNDLED_SSL%%include/node/openssl/types.h
+%%BUNDLED_SSL%%include/node/openssl/ui.h
+%%BUNDLED_SSL%%include/node/openssl/ui_asm.h
+%%BUNDLED_SSL%%include/node/openssl/ui_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/uierr.h
+%%BUNDLED_SSL%%include/node/openssl/whrlpool.h
+%%BUNDLED_SSL%%include/node/openssl/x509.h
+%%BUNDLED_SSL%%include/node/openssl/x509_asm.h
+%%BUNDLED_SSL%%include/node/openssl/x509_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/x509_vfy.h
+%%BUNDLED_SSL%%include/node/openssl/x509_vfy_asm.h
+%%BUNDLED_SSL%%include/node/openssl/x509_vfy_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/x509err.h
+%%BUNDLED_SSL%%include/node/openssl/x509v3.h
+%%BUNDLED_SSL%%include/node/openssl/x509v3_asm.h
+%%BUNDLED_SSL%%include/node/openssl/x509v3_no-asm.h
+%%BUNDLED_SSL%%include/node/openssl/x509v3err.h
+include/node/v8-array-buffer.h
+include/node/v8-callbacks.h
+include/node/v8-container.h
+include/node/v8-context.h
+include/node/v8-cppgc.h
+include/node/v8-data.h
+include/node/v8-date.h
+include/node/v8-debug.h
+include/node/v8-embedder-heap.h
+include/node/v8-embedder-state-scope.h
+include/node/v8-exception.h
+include/node/v8-extension.h
+include/node/v8-external.h
+include/node/v8-forward.h
+include/node/v8-function-callback.h
+include/node/v8-function.h
+include/node/v8-handle-base.h
+include/node/v8-initialization.h
+include/node/v8-internal.h
+include/node/v8-isolate.h
+include/node/v8-json.h
+include/node/v8-local-handle.h
+include/node/v8-locker.h
+include/node/v8-maybe.h
+include/node/v8-memory-span.h
+include/node/v8-message.h
+include/node/v8-microtask-queue.h
+include/node/v8-microtask.h
+include/node/v8-object.h
+include/node/v8-persistent-handle.h
+include/node/v8-platform.h
+include/node/v8-primitive-object.h
+include/node/v8-primitive.h
+include/node/v8-profiler.h
+include/node/v8-promise.h
+include/node/v8-proxy.h
+include/node/v8-regexp.h
+include/node/v8-sandbox.h
+include/node/v8-script.h
+include/node/v8-snapshot.h
+include/node/v8-source-location.h
+include/node/v8-statistics.h
+include/node/v8-template.h
+include/node/v8-traced-handle.h
+include/node/v8-typed-array.h
+include/node/v8-unwinder.h
+include/node/v8-value-serializer.h
+include/node/v8-value.h
+include/node/v8-version.h
+include/node/v8-wasm.h
+include/node/v8-weak-callback-info.h
+include/node/v8.h
+include/node/v8config.h
+lib/node_modules/corepack/CHANGELOG.md
+lib/node_modules/corepack/LICENSE.md
+lib/node_modules/corepack/README.md
+lib/node_modules/corepack/dist/corepack.js
+lib/node_modules/corepack/dist/lib/corepack.cjs
+lib/node_modules/corepack/dist/npm.js
+lib/node_modules/corepack/dist/npx.js
+lib/node_modules/corepack/dist/pnpm.js
+lib/node_modules/corepack/dist/pnpx.js
+lib/node_modules/corepack/dist/yarn.js
+lib/node_modules/corepack/dist/yarnpkg.js
+lib/node_modules/corepack/package.json
+lib/node_modules/corepack/shims/corepack
+lib/node_modules/corepack/shims/corepack.cmd
+lib/node_modules/corepack/shims/corepack.ps1
+lib/node_modules/corepack/shims/nodewin/corepack
+lib/node_modules/corepack/shims/nodewin/corepack.cmd
+lib/node_modules/corepack/shims/nodewin/corepack.ps1
+lib/node_modules/corepack/shims/nodewin/npm
+lib/node_modules/corepack/shims/nodewin/npm.cmd
+lib/node_modules/corepack/shims/nodewin/npm.ps1
+lib/node_modules/corepack/shims/nodewin/npx
+lib/node_modules/corepack/shims/nodewin/npx.cmd
+lib/node_modules/corepack/shims/nodewin/npx.ps1
+lib/node_modules/corepack/shims/nodewin/pnpm
+lib/node_modules/corepack/shims/nodewin/pnpm.cmd
+lib/node_modules/corepack/shims/nodewin/pnpm.ps1
+lib/node_modules/corepack/shims/nodewin/pnpx
+lib/node_modules/corepack/shims/nodewin/pnpx.cmd
+lib/node_modules/corepack/shims/nodewin/pnpx.ps1
+lib/node_modules/corepack/shims/nodewin/yarn
+lib/node_modules/corepack/shims/nodewin/yarn.cmd
+lib/node_modules/corepack/shims/nodewin/yarn.ps1
+lib/node_modules/corepack/shims/nodewin/yarnpkg
+lib/node_modules/corepack/shims/nodewin/yarnpkg.cmd
+lib/node_modules/corepack/shims/nodewin/yarnpkg.ps1
+lib/node_modules/corepack/shims/npm
+lib/node_modules/corepack/shims/npm.cmd
+lib/node_modules/corepack/shims/npm.ps1
+lib/node_modules/corepack/shims/npx
+lib/node_modules/corepack/shims/npx.cmd
+lib/node_modules/corepack/shims/npx.ps1
+lib/node_modules/corepack/shims/pnpm
+lib/node_modules/corepack/shims/pnpm.cmd
+lib/node_modules/corepack/shims/pnpm.ps1
+lib/node_modules/corepack/shims/pnpx
+lib/node_modules/corepack/shims/pnpx.cmd
+lib/node_modules/corepack/shims/pnpx.ps1
+lib/node_modules/corepack/shims/yarn
+lib/node_modules/corepack/shims/yarn.cmd
+lib/node_modules/corepack/shims/yarn.ps1
+lib/node_modules/corepack/shims/yarnpkg
+lib/node_modules/corepack/shims/yarnpkg.cmd
+lib/node_modules/corepack/shims/yarnpkg.ps1
+%%PORTDOCS%%%%DOCSDIR%%/gdbinit
+%%PORTDOCS%%%%DOCSDIR%%/lldb_commands.py
+@(,,444) share/man/man1/node.1.gz
diff --git a/www/novnc/Makefile b/www/novnc/Makefile
index b297cd22a997..2d15c2aa671b 100644
--- a/www/novnc/Makefile
+++ b/www/novnc/Makefile
@@ -1,6 +1,6 @@
PORTNAME= novnc
DISTVERSIONPREFIX= v
-DISTVERSION= 1.5.0
+DISTVERSION= 1.6.0
CATEGORIES= www
MAINTAINER= dpetrov67@gmail.com
diff --git a/www/novnc/distinfo b/www/novnc/distinfo
index 7b894a5ee8c5..ef60248173b4 100644
--- a/www/novnc/distinfo
+++ b/www/novnc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722735379
-SHA256 (novnc-noVNC-v1.5.0_GH0.tar.gz) = 6a73e41f98388a5348b7902f54b02d177cb73b7e5eb0a7a0dcf688cc2c79b42a
-SIZE (novnc-noVNC-v1.5.0_GH0.tar.gz) = 706843
+TIMESTAMP = 1747073404
+SHA256 (novnc-noVNC-v1.6.0_GH0.tar.gz) = 5066103959ef4e9b10f37e5a148627360dd8414e4cf8a7db92bdbd022e728aaa
+SIZE (novnc-noVNC-v1.6.0_GH0.tar.gz) = 724137
diff --git a/www/novnc/pkg-plist b/www/novnc/pkg-plist
index 3194a7842ea5..a011a0e566f4 100644
--- a/www/novnc/pkg-plist
+++ b/www/novnc/pkg-plist
@@ -61,6 +61,7 @@ libexec/novnc/app/sounds/bell.oga
libexec/novnc/app/styles/Orbitron700.ttf
libexec/novnc/app/styles/Orbitron700.woff
libexec/novnc/app/styles/base.css
+libexec/novnc/app/styles/constants.css
libexec/novnc/app/styles/input.css
libexec/novnc/app/ui.js
libexec/novnc/app/webutil.js
@@ -73,12 +74,14 @@ libexec/novnc/core/crypto/dh.js
libexec/novnc/core/crypto/md5.js
libexec/novnc/core/crypto/rsa.js
libexec/novnc/core/decoders/copyrect.js
+libexec/novnc/core/decoders/h264.js
libexec/novnc/core/decoders/hextile.js
libexec/novnc/core/decoders/jpeg.js
libexec/novnc/core/decoders/raw.js
libexec/novnc/core/decoders/rre.js
libexec/novnc/core/decoders/tight.js
libexec/novnc/core/decoders/tightpng.js
+libexec/novnc/core/decoders/zlib.js
libexec/novnc/core/decoders/zrle.js
libexec/novnc/core/deflator.js
libexec/novnc/core/display.js
@@ -104,6 +107,7 @@ libexec/novnc/core/util/int.js
libexec/novnc/core/util/logging.js
libexec/novnc/core/util/strings.js
libexec/novnc/core/websock.js
+libexec/novnc/defaults.json
libexec/novnc/docs/API-internal.md
libexec/novnc/docs/API.md
libexec/novnc/docs/EMBEDDING.md
@@ -122,6 +126,7 @@ libexec/novnc/docs/rfbproto-3.7.pdf
libexec/novnc/docs/rfbproto-3.8.pdf
libexec/novnc/eslint.config.mjs
libexec/novnc/karma.conf.js
+libexec/novnc/mandatory.json
libexec/novnc/package.json
libexec/novnc/po/Makefile
libexec/novnc/po/cs.po
@@ -156,6 +161,7 @@ libexec/novnc/tests/test.copyrect.js
libexec/novnc/tests/test.deflator.js
libexec/novnc/tests/test.display.js
libexec/novnc/tests/test.gesturehandler.js
+libexec/novnc/tests/test.h264.js
libexec/novnc/tests/test.helper.js
libexec/novnc/tests/test.hextile.js
libexec/novnc/tests/test.inflator.js
@@ -171,6 +177,7 @@ libexec/novnc/tests/test.tightpng.js
libexec/novnc/tests/test.util.js
libexec/novnc/tests/test.websock.js
libexec/novnc/tests/test.webutil.js
+libexec/novnc/tests/test.zlib.js
libexec/novnc/tests/test.zrle.js
libexec/novnc/tests/vnc_playback.html
libexec/novnc/utils/README.md
diff --git a/www/npm-node24/Makefile b/www/npm-node24/Makefile
new file mode 100644
index 000000000000..8ad8600cf41c
--- /dev/null
+++ b/www/npm-node24/Makefile
@@ -0,0 +1,5 @@
+USES= nodejs:24,run
+
+MASTERDIR= ${.CURDIR}/../npm-node22
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/npm/Makefile b/www/npm/Makefile
index f5083db76baf..e0e324df244c 100644
--- a/www/npm/Makefile
+++ b/www/npm/Makefile
@@ -5,7 +5,7 @@ CATEGORIES= www
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Node package manager (meta port)
WWW= https://www.npmjs.com/package/npm \
- https://docs.npmjs.com/cli/v10 \
+ https://docs.npmjs.com/ \
https://github.com/npm/cli
RUN_DEPENDS= npm${NODEJS_SUFFIX}>=0:www/npm${NODEJS_SUFFIX}
diff --git a/www/p5-Mojolicious/Makefile b/www/p5-Mojolicious/Makefile
index 535ef0597b30..d9533ffdf8a7 100644
--- a/www/p5-Mojolicious/Makefile
+++ b/www/p5-Mojolicious/Makefile
@@ -1,5 +1,5 @@
PORTNAME= Mojolicious
-PORTVERSION= 9.39
+PORTVERSION= 9.40
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/www/p5-Mojolicious/distinfo b/www/p5-Mojolicious/distinfo
index 92fa4f36a774..4123f6cb0736 100644
--- a/www/p5-Mojolicious/distinfo
+++ b/www/p5-Mojolicious/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732590629
-SHA256 (Mojolicious-9.39.tar.gz) = 130a490d77d76139f734ce1b894d459bae03805fb1f3dfdd58fc44fe82af3cfd
-SIZE (Mojolicious-9.39.tar.gz) = 962558
+TIMESTAMP = 1747105281
+SHA256 (Mojolicious-9.40.tar.gz) = 4d45f4b51cce46b3896f2e27b2447e52a8efccb1ebea5e6b3885ea211c08480b
+SIZE (Mojolicious-9.40.tar.gz) = 965888
diff --git a/www/p5-Net-Curl/Makefile b/www/p5-Net-Curl/Makefile
index 3a5440ad62fb..b579501e7631 100644
--- a/www/p5-Net-Curl/Makefile
+++ b/www/p5-Net-Curl/Makefile
@@ -1,5 +1,6 @@
PORTNAME= Net-Curl
-PORTVERSION= 0.57
+DISTVERSION= 0.57
+PORTREVISION= 1
CATEGORIES= www ftp perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -10,10 +11,10 @@ WWW= https://metacpan.org/dist/Net-Curl
LICENSE= MIT
-LIB_DEPENDS= libcurl.so:ftp/curl
BUILD_DEPENDS= p5-ExtUtils-PkgConfig>=1.16:devel/p5-ExtUtils-PkgConfig
+LIB_DEPENDS= libcurl.so:ftp/curl
-USES= perl5 localbase
+USES= localbase perl5
USE_PERL5= configure
post-install:
diff --git a/www/p5-Net-Curl/files/patch-Makefile.PL b/www/p5-Net-Curl/files/patch-Makefile.PL
new file mode 100644
index 000000000000..f3e843a6182c
--- /dev/null
+++ b/www/p5-Net-Curl/files/patch-Makefile.PL
@@ -0,0 +1,11 @@
+--- Makefile.PL.orig 2025-05-11 19:09:26 UTC
++++ Makefile.PL
+@@ -341,7 +341,7 @@ sub get_constants_headers
+
+ my @out;
+ foreach my $e (sort keys %syms) {
+- if ( $e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z|^CURL_FORMAT_OFF_T$|^CURL_ISOCPP$|^CURLOPT$)/ ) {
++ if ( $e =~ /(OBSOLETE|^CURL_DEPRECATED\z|^CURL_EXTERN|^CURL_IGNORE_DEPRECATION\z|^CURLOPTDEPRECATED\z|_LAST\z|_LASTENTRY\z|^CURL_FORMAT_OFF_T$|^CURL_ISOCPP$|^CURLOPT$|^CURL_HAS_)/ ) {
+ next;
+ }
+ push @out, $e;
diff --git a/www/p5-Net-Curl/files/patch-inc_symbols-in-versions b/www/p5-Net-Curl/files/patch-inc_symbols-in-versions
index 95daebaf8ec9..50d4a7b6f1bb 100644
--- a/www/p5-Net-Curl/files/patch-inc_symbols-in-versions
+++ b/www/p5-Net-Curl/files/patch-inc_symbols-in-versions
@@ -1,6 +1,37 @@
---- inc/symbols-in-versions.orig 2025-01-20 14:34:49 UTC
+--- inc/symbols-in-versions.orig 2025-05-11 19:08:52 UTC
+++ inc/symbols-in-versions
-@@ -449,6 +449,7 @@ CURLINFO_HTTP_CODE 7.4.1 7.10.8
+@@ -45,6 +45,7 @@ CURL_GLOBAL_WIN32 7.8.1
+ CURL_GLOBAL_NOTHING 7.8
+ CURL_GLOBAL_SSL 7.8
+ CURL_GLOBAL_WIN32 7.8.1
++CURL_HAS_DECLSPEC_ATTRIBUTE 8.13.0
+ CURL_HET_DEFAULT 7.59.0
+ CURL_HTTP_VERSION_1_0 7.9.1
+ CURL_HTTP_VERSION_1_1 7.9.1
+@@ -336,11 +337,11 @@ CURLE_URL_MALFORMAT 7.1
+ CURLE_UNSUPPORTED_PROTOCOL 7.1
+ CURLE_UPLOAD_FAILED 7.16.3
+ CURLE_URL_MALFORMAT 7.1
++CURLE_ECH_REQUIRED 8.8.0
+ CURLE_URL_MALFORMAT_USER 7.1 7.17.0
+ CURLE_USE_SSL_FAILED 7.17.0
+ CURLE_WEIRD_SERVER_REPLY 7.51.0
+ CURLE_WRITE_ERROR 7.1
+-CURLE_ECH_REQUIRED 8.8.0
+ CURLFILETYPE_DEVICE_BLOCK 7.21.0
+ CURLFILETYPE_DEVICE_CHAR 7.21.0
+ CURLFILETYPE_DIRECTORY 7.21.0
+@@ -358,6 +359,9 @@ CURLFINFOFLAG_KNOWN_UID 7.21.0
+ CURLFINFOFLAG_KNOWN_SIZE 7.21.0
+ CURLFINFOFLAG_KNOWN_TIME 7.21.0
+ CURLFINFOFLAG_KNOWN_UID 7.21.0
++CURLFOLLOW_ALL 8.13.0
++CURLFOLLOW_OBEYCODE 8.13.0
++CURLFOLLOW_FIRSTONLY 8.13.0
+ CURLFORM_ARRAY 7.9.1 7.56.0
+ CURLFORM_ARRAY_END 7.9.1 7.9.5 7.9.6
+ CURLFORM_ARRAY_START 7.9.1 7.9.5 7.9.6
+@@ -449,6 +453,7 @@ CURLINFO_HTTPAUTH_AVAIL 7.10.8
CURLINFO_HTTP_CONNECTCODE 7.10.7
CURLINFO_HTTP_VERSION 7.50.0
CURLINFO_HTTPAUTH_AVAIL 7.10.8
@@ -8,7 +39,7 @@
CURLINFO_LASTONE 7.4.1
CURLINFO_LASTSOCKET 7.15.2 7.45.0
CURLINFO_LOCAL_IP 7.21.0
-@@ -471,6 +472,7 @@ CURLINFO_PROTOCOL 7.52.0 7.85.0
+@@ -471,6 +476,7 @@ CURLINFO_PROXYAUTH_AVAIL 7.10.8
CURLINFO_PROXY_ERROR 7.73.0
CURLINFO_PROXY_SSL_VERIFYRESULT 7.52.0
CURLINFO_PROXYAUTH_AVAIL 7.10.8
@@ -16,3 +47,34 @@
CURLINFO_PTR 7.54.1
CURLINFO_QUEUE_TIME_T 8.6.0
CURLINFO_REDIRECT_COUNT 7.9.7
+@@ -889,6 +895,7 @@ CURLOPT_UPLOAD_BUFFERSIZE 7.62.0
+ CURLOPT_UPKEEP_INTERVAL_MS 7.62.0
+ CURLOPT_UPLOAD 7.1
+ CURLOPT_UPLOAD_BUFFERSIZE 7.62.0
++CURLOPT_UPLOAD_FLAGS 8.13.0
+ CURLOPT_URL 7.1
+ CURLOPT_USE_SSL 7.17.0
+ CURLOPT_USERAGENT 7.1
+@@ -1122,6 +1129,11 @@ CURLUPART_ZONEID 7.65.0
+ CURLUPART_URL 7.62.0
+ CURLUPART_USER 7.62.0
+ CURLUPART_ZONEID 7.65.0
++CURLULFLAG_ANSWERED 8.13.0
++CURLULFLAG_DELETED 8.13.0
++CURLULFLAG_DRAFT 8.13.0
++CURLULFLAG_FLAGGED 8.13.0
++CURLULFLAG_SEEN 8.13.0
+ CURLUSESSL_ALL 7.17.0
+ CURLUSESSL_CONTROL 7.17.0
+ CURLUSESSL_NONE 7.17.0
+@@ -1150,8 +1162,8 @@ LIBCURL_TIMESTAMP 7.16.2
+ CURLWS_TEXT 7.86.0
+ LIBCURL_COPYRIGHT 7.18.0
+ LIBCURL_TIMESTAMP 7.16.2
+-LIBCURL_VERSION 7.11.0
++LIBCURL_VERSION 7.1.1
+ LIBCURL_VERSION_MAJOR 7.11.0
+ LIBCURL_VERSION_MINOR 7.11.0
+-LIBCURL_VERSION_NUM 7.11.0
++LIBCURL_VERSION_NUM 7.1.1
+ LIBCURL_VERSION_PATCH 7.11.0
diff --git a/www/p5-ParallelUserAgent/Makefile b/www/p5-ParallelUserAgent/Makefile
index d5d43c636cab..e88dd31b4d15 100644
--- a/www/p5-ParallelUserAgent/Makefile
+++ b/www/p5-ParallelUserAgent/Makefile
@@ -20,6 +20,5 @@ USES= perl5 tar:tgz
USE_PERL5= configure
NO_ARCH= yes
-REINPLACE_ARGS= -i ''
.include <bsd.port.mk>
diff --git a/www/p5-Parse-HTTP-UserAgent/Makefile b/www/p5-Parse-HTTP-UserAgent/Makefile
index fc122d2e604b..e8664b92677b 100644
--- a/www/p5-Parse-HTTP-UserAgent/Makefile
+++ b/www/p5-Parse-HTTP-UserAgent/Makefile
@@ -1,5 +1,5 @@
PORTNAME= Parse-HTTP-UserAgent
-PORTVERSION= 0.42
+PORTVERSION= 0.43
CATEGORIES= www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:BURAK
@@ -11,7 +11,7 @@ WWW= https://metacpan.org/release/Parse-HTTP-UserAgent
LICENSE= ART10 GPLv1+
LICENSE_COMB= dual
-LICENSE_FILE= ${WRKSRC}/LICENSE
+LICENSE_FILE_GPLv1+ = ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-JSON>=0:converters/p5-JSON \
diff --git a/www/p5-Parse-HTTP-UserAgent/distinfo b/www/p5-Parse-HTTP-UserAgent/distinfo
index 8f51a627f744..f6abb4481941 100644
--- a/www/p5-Parse-HTTP-UserAgent/distinfo
+++ b/www/p5-Parse-HTTP-UserAgent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511371425
-SHA256 (Parse-HTTP-UserAgent-0.42.tar.gz) = 004940bbb1b8c24550c011865adcb5d3c3692eb229006088dd89795aa5014215
-SIZE (Parse-HTTP-UserAgent-0.42.tar.gz) = 60949
+TIMESTAMP = 1745936102
+SHA256 (Parse-HTTP-UserAgent-0.43.tar.gz) = f092dfae99756d3daffd1c8912d6a04cd05e6bb13a4659377c6c46208d7bf184
+SIZE (Parse-HTTP-UserAgent-0.43.tar.gz) = 55466
diff --git a/www/p5-Perlanet/Makefile b/www/p5-Perlanet/Makefile
index e0a2ecdd8eb7..f30db486d1e6 100644
--- a/www/p5-Perlanet/Makefile
+++ b/www/p5-Perlanet/Makefile
@@ -1,5 +1,5 @@
PORTNAME= Perlanet
-PORTVERSION= 3.3.2
+PORTVERSION= 3.3.3
DISTVERSIONPREFIX= v
CATEGORIES= www perl5
MASTER_SITES= CPAN
diff --git a/www/p5-Perlanet/distinfo b/www/p5-Perlanet/distinfo
index e3e36c7f2ae5..32bfe5678b4a 100644
--- a/www/p5-Perlanet/distinfo
+++ b/www/p5-Perlanet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745178252
-SHA256 (Perlanet-v3.3.2.tar.gz) = 19e662fcdd3fdf5062b4c9f681ff4b61da7bb6ada0796d4f7ae2d619c7760fd6
-SIZE (Perlanet-v3.3.2.tar.gz) = 69402
+TIMESTAMP = 1746944152
+SHA256 (Perlanet-v3.3.3.tar.gz) = 54bfb5b6fc29a445e693c97b02557a62292e3d780551be20a1a541f4513b5566
+SIZE (Perlanet-v3.3.3.tar.gz) = 69906
diff --git a/www/p5-WWW-OAuth/Makefile b/www/p5-WWW-OAuth/Makefile
index 5cbce6145e30..e1a7a573005c 100644
--- a/www/p5-WWW-OAuth/Makefile
+++ b/www/p5-WWW-OAuth/Makefile
@@ -1,5 +1,6 @@
PORTNAME= WWW-OAuth
-PORTVERSION= 1.002
+PORTVERSION= 1.003
+PORTREVISION= 1
CATEGORIES= www perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -13,14 +14,15 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${RUN_DEPENDS}
RUN_DEPENDS= p5-Class-Tiny-Chained>0:devel/p5-Class-Tiny-Chained \
- p5-Crypt-URandom>=0.37:security/p5-Crypt-URandom \
+ p5-Crypt-SysRandom>=0:security/p5-Crypt-SysRandom \
p5-HTTP-Message>0:www/p5-HTTP-Message \
+ p5-libwww>0:www/p5-libwww \
p5-Module-Runtime>0:devel/p5-Module-Runtime \
p5-Mojolicious>0:www/p5-Mojolicious \
p5-Role-Tiny>0:devel/p5-Role-Tiny \
p5-URI>0:net/p5-URI \
- p5-WWW-Form-UrlEncoded>0:www/p5-WWW-Form-UrlEncoded \
- p5-libwww>0:www/p5-libwww
+ p5-WWW-Form-UrlEncoded>0:www/p5-WWW-Form-UrlEncoded
+TEST_DEPENDS= p5-Test-Needs>=0:devel/p5-Test-Needs
USES= perl5
USE_PERL5= configure
diff --git a/www/p5-WWW-OAuth/distinfo b/www/p5-WWW-OAuth/distinfo
index 66538c72eb17..fca30a0f05d0 100644
--- a/www/p5-WWW-OAuth/distinfo
+++ b/www/p5-WWW-OAuth/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738090236
-SHA256 (WWW-OAuth-1.002.tar.gz) = bf8830ed7167d62aaa664a7270654910f7e54697f24823177b37753e477fcab2
-SIZE (WWW-OAuth-1.002.tar.gz) = 26590
+TIMESTAMP = 1745936436
+SHA256 (WWW-OAuth-1.003.tar.gz) = 8fcb117acd71b07fb6fe9dd4330b4f6cc702634520270b1d1bedb925e58e1df6
+SIZE (WWW-OAuth-1.003.tar.gz) = 27014
diff --git a/www/proxygen/Makefile b/www/proxygen/Makefile
index ec8f251d3069..e29bf0e39b54 100644
--- a/www/proxygen/Makefile
+++ b/www/proxygen/Makefile
@@ -1,6 +1,6 @@
PORTNAME= proxygen
DISTVERSIONPREFIX= v
-DISTVERSION= 2025.05.05.00
+DISTVERSION= 2025.05.19.00
CATEGORIES= www
MAINTAINER= yuri@FreeBSD.org
diff --git a/www/proxygen/distinfo b/www/proxygen/distinfo
index 01ccbe20b4ec..8ff6ca192308 100644
--- a/www/proxygen/distinfo
+++ b/www/proxygen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746504543
-SHA256 (facebook-proxygen-v2025.05.05.00_GH0.tar.gz) = 3f9e352e1f31ef994383e4800cc0d5768c56a9e0993da67f807e04b52a90200c
-SIZE (facebook-proxygen-v2025.05.05.00_GH0.tar.gz) = 1216793
+TIMESTAMP = 1747730524
+SHA256 (facebook-proxygen-v2025.05.19.00_GH0.tar.gz) = 9f228584d42be9381bdc044a8289f2a6db34fae2e8f23239e9748fb37938edc6
+SIZE (facebook-proxygen-v2025.05.19.00_GH0.tar.gz) = 1217144
diff --git a/www/py-adblock/Makefile b/www/py-adblock/Makefile
index 7c8345cb747b..05b3c8778895 100644
--- a/www/py-adblock/Makefile
+++ b/www/py-adblock/Makefile
@@ -1,6 +1,6 @@
PORTNAME= adblock
DISTVERSION= 0.6.0
-PORTREVISION= 31
+PORTREVISION= 32
CATEGORIES= www python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-aiohttp/Makefile b/www/py-aiohttp/Makefile
index 63fe51de5675..d54a2966f286 100644
--- a/www/py-aiohttp/Makefile
+++ b/www/py-aiohttp/Makefile
@@ -1,5 +1,5 @@
PORTNAME= aiohttp
-PORTVERSION= 3.11.16
+PORTVERSION= 3.11.18
CATEGORIES= www python
MASTER_SITES= PYPI \
https://github.com/aio-libs/aiohttp/releases/download/v${PORTVERSION}/
diff --git a/www/py-aiohttp/distinfo b/www/py-aiohttp/distinfo
index 9d5cac6f8e67..65cd2cfaae71 100644
--- a/www/py-aiohttp/distinfo
+++ b/www/py-aiohttp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289046
-SHA256 (aiohttp-3.11.16.tar.gz) = 16f8a2c9538c14a557b4d309ed4d0a7c60f0253e8ed7b6c9a2859a7582f8b1b8
-SIZE (aiohttp-3.11.16.tar.gz) = 7676826
+TIMESTAMP = 1745936222
+SHA256 (aiohttp-3.11.18.tar.gz) = ae856e1138612b7e412db63b7708735cff4d38d0399f6a5435d3dac2669f558a
+SIZE (aiohttp-3.11.18.tar.gz) = 7678653
diff --git a/www/py-boto3/Makefile b/www/py-boto3/Makefile
index 2d0e196993b0..5daf79d8c5cb 100644
--- a/www/py-boto3/Makefile
+++ b/www/py-boto3/Makefile
@@ -1,5 +1,5 @@
PORTNAME= boto3
-PORTVERSION= 1.37.36
+PORTVERSION= 1.38.5
CATEGORIES= www python devel
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -14,9 +14,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=${PORTVERSION}<1.38.0:devel/py-botocore@${PY_FLAVOR} \
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}botocore>=${PORTVERSION}<1.39.0:devel/py-botocore@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}jmespath>=0.7.1<2.0.0:devel/py-jmespath@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.11.0<0.12.0:net/py-s3transfer@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}s3transfer>=0.12.0<0.13.0:net/py-s3transfer@${PY_FLAVOR}
USES= python
USE_PYTHON= autoplist concurrent pep517 pytest
diff --git a/www/py-boto3/distinfo b/www/py-boto3/distinfo
index e6f27da78d56..d41ec5bc0b76 100644
--- a/www/py-boto3/distinfo
+++ b/www/py-boto3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745178100
-SHA256 (boto3-1.37.36.tar.gz) = 3012bb083a7d7653f117a1d53bdd8a4185b59afed74422eaa32d06f55bd411ee
-SIZE (boto3-1.37.36.tar.gz) = 111649
+TIMESTAMP = 1747546588
+SHA256 (boto3-1.38.5.tar.gz) = 4cd581f77e67dbc28579134e1ee7b522797cfde30e0c735e7537ec4a3fb6af45
+SIZE (boto3-1.38.5.tar.gz) = 111813
diff --git a/www/py-dash/Makefile b/www/py-dash/Makefile
index 3620aef6d56e..88ae8e188fe1 100644
--- a/www/py-dash/Makefile
+++ b/www/py-dash/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dash
-PORTVERSION= 3.0.3
+PORTVERSION= 3.0.4
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-dash/distinfo b/www/py-dash/distinfo
index 57a4a0a04a16..595086066de0 100644
--- a/www/py-dash/distinfo
+++ b/www/py-dash/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745178102
-SHA256 (dash-3.0.3.tar.gz) = 86d3038ae9f09e1f246937afbab5451c9db5a3832911c325d2e1f0bcefe2b7c9
-SIZE (dash-3.0.3.tar.gz) = 7603520
+TIMESTAMP = 1745936226
+SHA256 (dash-3.0.4.tar.gz) = 4f9e62e9d8c5cd1b42dc6d6dcf211fe9498195f73ef0edb62a26e2a1b952a368
+SIZE (dash-3.0.4.tar.gz) = 7592060
diff --git a/www/py-dj50-django-auth-ldap/Makefile b/www/py-dj50-django-auth-ldap/Makefile
index d48e46991bd5..eaa0337951dc 100644
--- a/www/py-dj50-django-auth-ldap/Makefile
+++ b/www/py-dj50-django-auth-ldap/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-auth-ldap
-PORTVERSION= 5.1.0
+PORTVERSION= 5.2.0
CATEGORIES= www security python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj50-
diff --git a/www/py-dj50-django-auth-ldap/distinfo b/www/py-dj50-django-auth-ldap/distinfo
index 2ae0a3f4baa0..d60b5a523112 100644
--- a/www/py-dj50-django-auth-ldap/distinfo
+++ b/www/py-dj50-django-auth-ldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730477310
-SHA256 (django_auth_ldap-5.1.0.tar.gz) = 9c607e8d9c53cf2a0ccafbe0acfc33eb1d1fd474c46ec52d30aee0dca1da9668
-SIZE (django_auth_ldap-5.1.0.tar.gz) = 55059
+TIMESTAMP = 1747314334
+SHA256 (django_auth_ldap-5.2.0.tar.gz) = 08ba6efc0340d9874725a962311b14991e29a33593eb150a8fb640709dbfa80f
+SIZE (django_auth_ldap-5.2.0.tar.gz) = 55287
diff --git a/www/py-dj51-django-auth-ldap/Makefile b/www/py-dj51-django-auth-ldap/Makefile
index 94a842eefd8b..b71226b9f650 100644
--- a/www/py-dj51-django-auth-ldap/Makefile
+++ b/www/py-dj51-django-auth-ldap/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-auth-ldap
-PORTVERSION= 5.1.0
+PORTVERSION= 5.2.0
CATEGORIES= www security python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj51-
diff --git a/www/py-dj51-django-auth-ldap/distinfo b/www/py-dj51-django-auth-ldap/distinfo
index 2ae0a3f4baa0..d60b5a523112 100644
--- a/www/py-dj51-django-auth-ldap/distinfo
+++ b/www/py-dj51-django-auth-ldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730477310
-SHA256 (django_auth_ldap-5.1.0.tar.gz) = 9c607e8d9c53cf2a0ccafbe0acfc33eb1d1fd474c46ec52d30aee0dca1da9668
-SIZE (django_auth_ldap-5.1.0.tar.gz) = 55059
+TIMESTAMP = 1747314334
+SHA256 (django_auth_ldap-5.2.0.tar.gz) = 08ba6efc0340d9874725a962311b14991e29a33593eb150a8fb640709dbfa80f
+SIZE (django_auth_ldap-5.2.0.tar.gz) = 55287
diff --git a/www/py-dj51-django-debug-toolbar/Makefile b/www/py-dj51-django-debug-toolbar/Makefile
index 5ae1a007efa5..8e5e77a10643 100644
--- a/www/py-dj51-django-debug-toolbar/Makefile
+++ b/www/py-dj51-django-debug-toolbar/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-debug-toolbar
-PORTVERSION= 5.1.0
+PORTVERSION= 5.2.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}dj51-
diff --git a/www/py-dj51-django-debug-toolbar/distinfo b/www/py-dj51-django-debug-toolbar/distinfo
index 3ee14f7e2772..e35c7a29ee2d 100644
--- a/www/py-dj51-django-debug-toolbar/distinfo
+++ b/www/py-dj51-django-debug-toolbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289058
-SHA256 (django_debug_toolbar-5.1.0.tar.gz) = 8a3b9da4aeab8d384a366e20304bd939a451f0242523c5b7b402248ad474eed2
-SIZE (django_debug_toolbar-5.1.0.tar.gz) = 294567
+TIMESTAMP = 1747546590
+SHA256 (django_debug_toolbar-5.2.0.tar.gz) = 9e7f0145e1a1b7d78fcc3b53798686170a5b472d9cf085d88121ff823e900821
+SIZE (django_debug_toolbar-5.2.0.tar.gz) = 297901
diff --git a/www/py-django-auth-ldap/Makefile b/www/py-django-auth-ldap/Makefile
index 8e92221e47f5..c27d62dce257 100644
--- a/www/py-django-auth-ldap/Makefile
+++ b/www/py-django-auth-ldap/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-auth-ldap
-PORTVERSION= 5.1.0
+PORTVERSION= 5.2.0
CATEGORIES= www security python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +18,7 @@ BUILD_DEPENDS= ${PY_SETUPTOOLS} \
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2:www/py-django42@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}python-ldap>=3.1:net/py-python-ldap@${PY_FLAVOR}
-USES= python:3.9+
+USES= python
USE_PYTHON= autoplist concurrent pep517
NO_ARCH= yes
diff --git a/www/py-django-auth-ldap/distinfo b/www/py-django-auth-ldap/distinfo
index 2ae0a3f4baa0..d60b5a523112 100644
--- a/www/py-django-auth-ldap/distinfo
+++ b/www/py-django-auth-ldap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1730477310
-SHA256 (django_auth_ldap-5.1.0.tar.gz) = 9c607e8d9c53cf2a0ccafbe0acfc33eb1d1fd474c46ec52d30aee0dca1da9668
-SIZE (django_auth_ldap-5.1.0.tar.gz) = 55059
+TIMESTAMP = 1747314334
+SHA256 (django_auth_ldap-5.2.0.tar.gz) = 08ba6efc0340d9874725a962311b14991e29a33593eb150a8fb640709dbfa80f
+SIZE (django_auth_ldap-5.2.0.tar.gz) = 55287
diff --git a/www/py-django-cms/Makefile b/www/py-django-cms/Makefile
index ceb746724eb2..a259ecd7f3d6 100644
--- a/www/py-django-cms/Makefile
+++ b/www/py-django-cms/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-cms
-PORTVERSION= 4.1.6
+PORTVERSION= 5.0.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-cms/distinfo b/www/py-django-cms/distinfo
index c6203f9de516..23a5dd29c01c 100644
--- a/www/py-django-cms/distinfo
+++ b/www/py-django-cms/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746605285
-SHA256 (django_cms-4.1.6.tar.gz) = fdba4b4468c32937151ff91eea71d8067e352ddddcecbdac2724cd5d9c31920f
-SIZE (django_cms-4.1.6.tar.gz) = 5107485
+TIMESTAMP = 1747790352
+SHA256 (django_cms-5.0.0.tar.gz) = 2249129a767f77358e62a5089b704cd507e237688802791b51254fe7a882fc19
+SIZE (django_cms-5.0.0.tar.gz) = 4932664
diff --git a/www/py-django-debug-toolbar/Makefile b/www/py-django-debug-toolbar/Makefile
index c26aeb3e30fa..85b604599478 100644
--- a/www/py-django-debug-toolbar/Makefile
+++ b/www/py-django-debug-toolbar/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-debug-toolbar
-PORTVERSION= 5.1.0
+PORTVERSION= 5.2.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-debug-toolbar/distinfo b/www/py-django-debug-toolbar/distinfo
index 9cc614568b81..5a70e9e3383e 100644
--- a/www/py-django-debug-toolbar/distinfo
+++ b/www/py-django-debug-toolbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289060
-SHA256 (django_debug_toolbar-5.1.0.tar.gz) = 8a3b9da4aeab8d384a366e20304bd939a451f0242523c5b7b402248ad474eed2
-SIZE (django_debug_toolbar-5.1.0.tar.gz) = 294567
+TIMESTAMP = 1747546592
+SHA256 (django_debug_toolbar-5.2.0.tar.gz) = 9e7f0145e1a1b7d78fcc3b53798686170a5b472d9cf085d88121ff823e900821
+SIZE (django_debug_toolbar-5.2.0.tar.gz) = 297901
diff --git a/www/py-django-markdownx/Makefile b/www/py-django-markdownx/Makefile
index c9c317ed6189..34d1249bc3b9 100644
--- a/www/py-django-markdownx/Makefile
+++ b/www/py-django-markdownx/Makefile
@@ -1,13 +1,13 @@
PORTNAME= django-markdownx
-PORTVERSION= 4.0.7
-PORTREVISION= 2
+PORTVERSION= 4.0.9
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= Comprehensive Markdown editor built for Django
-WWW= https://github.com/neutronX/django-markdownx
+WWW= https://neutronx.github.io/django-markdownx/ \
+ https://github.com/neutronX/django-markdownx
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
diff --git a/www/py-django-markdownx/distinfo b/www/py-django-markdownx/distinfo
index 700d2a79c103..4b71b4bc1edf 100644
--- a/www/py-django-markdownx/distinfo
+++ b/www/py-django-markdownx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1702543710
-SHA256 (django-markdownx-4.0.7.tar.gz) = 38aa331c2ca0bee218b77f462361b5393e4727962bc6021939c09048363cb6ea
-SIZE (django-markdownx-4.0.7.tar.gz) = 35697
+TIMESTAMP = 1745936228
+SHA256 (django-markdownx-4.0.9.tar.gz) = f82949beaddcaf5cbe765f580b1bf062b3aa5eea94633fdbbb6466514311a907
+SIZE (django-markdownx-4.0.9.tar.gz) = 32649
diff --git a/www/py-django-stubs-ext/Makefile b/www/py-django-stubs-ext/Makefile
index 1dc3688ecf14..856481f91657 100644
--- a/www/py-django-stubs-ext/Makefile
+++ b/www/py-django-stubs-ext/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-stubs-ext
-PORTVERSION= 5.1.3
+PORTVERSION= 5.2.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -17,7 +17,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLA
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=0:www/py-django42@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}typing-extensions>=0:devel/py-typing-extensions@${PY_FLAVOR}
-USES= python
+USES= python:3.10+
USE_PYTHON= autoplist concurrent pep517
NO_ARCH= yes
diff --git a/www/py-django-stubs-ext/distinfo b/www/py-django-stubs-ext/distinfo
index 1893c9dfccdd..185cb1c2360a 100644
--- a/www/py-django-stubs-ext/distinfo
+++ b/www/py-django-stubs-ext/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739116734
-SHA256 (django_stubs_ext-5.1.3.tar.gz) = 3e60f82337f0d40a362f349bf15539144b96e4ceb4dbd0239be1cd71f6a74ad0
-SIZE (django_stubs_ext-5.1.3.tar.gz) = 9613
+TIMESTAMP = 1745936230
+SHA256 (django_stubs_ext-5.2.0.tar.gz) = 00c4ae307b538f5643af761a914c3f8e4e3f25f4e7c6d7098f1906c0d8f2aac9
+SIZE (django_stubs_ext-5.2.0.tar.gz) = 9618
diff --git a/www/py-django-tasks/Makefile b/www/py-django-tasks/Makefile
index 0cce006db405..5a194a1e3f02 100644
--- a/www/py-django-tasks/Makefile
+++ b/www/py-django-tasks/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-tasks
-PORTVERSION= 0.6.1
+PORTVERSION= 0.7.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -23,10 +23,13 @@ USE_PYTHON= autoplist concurrent pep517
NO_ARCH= yes
-OPTIONS_DEFINE= MYSQL POSTGRES
+OPTIONS_DEFINE= MYSQL POSTGRES RQ
POSTGRES_DESC= PostgreSQL database support
+RQ_DESC= RQ (Redis Queue) support
MYSQL_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mysqlclient>=0:databases/py-mysqlclient@${PY_FLAVOR}
POSTGRES_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psycopg>=0:databases/py-psycopg@${PY_FLAVOR}
+RQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django-rq>=0:devel/py-django-rq@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}rq-scheduler>=0:devel/py-rq-scheduler@${PY_FLAVOR}
.include <bsd.port.mk>
diff --git a/www/py-django-tasks/distinfo b/www/py-django-tasks/distinfo
index eb923f72d139..fb8a55398972 100644
--- a/www/py-django-tasks/distinfo
+++ b/www/py-django-tasks/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606371
-SHA256 (django_tasks-0.6.1.tar.gz) = 4086e7eb9e965f79c4ac76f5c3690ec3bf41c461585237b71b4bde729ced9826
-SIZE (django_tasks-0.6.1.tar.gz) = 26575
+TIMESTAMP = 1745936232
+SHA256 (django_tasks-0.7.0.tar.gz) = 499f80d1a051566443cfa88a300d8b03435af7fc5708cad4d8da6d285614f739
+SIZE (django_tasks-0.7.0.tar.gz) = 29581
diff --git a/www/py-django-unfold/Makefile b/www/py-django-unfold/Makefile
index 6e67045a4c9d..59f7ee9c3a15 100644
--- a/www/py-django-unfold/Makefile
+++ b/www/py-django-unfold/Makefile
@@ -1,5 +1,5 @@
PORTNAME= django-unfold
-PORTVERSION= 0.55.2
+PORTVERSION= 0.56.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-django-unfold/distinfo b/www/py-django-unfold/distinfo
index 472b6125d79a..778604ea8ea8 100644
--- a/www/py-django-unfold/distinfo
+++ b/www/py-django-unfold/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745178104
-SHA256 (django_unfold-0.55.2.tar.gz) = 1bc54541265517766007a7c9b741c9823a569f6ea37a360904adc1625690ee51
-SIZE (django_unfold-0.55.2.tar.gz) = 1058017
+TIMESTAMP = 1747546594
+SHA256 (django_unfold-0.56.0.tar.gz) = 66d48ddc1f0aa3c56731dfb12d4e7d3fd395384a815a5e293012cfedb144da61
+SIZE (django_unfold-0.56.0.tar.gz) = 1057772
diff --git a/www/py-flask/Makefile b/www/py-flask/Makefile
index 64975c52c559..b7c137b698ff 100644
--- a/www/py-flask/Makefile
+++ b/www/py-flask/Makefile
@@ -1,5 +1,5 @@
PORTNAME= flask
-DISTVERSION= 3.1.0
+DISTVERSION= 3.1.1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-flask/distinfo b/www/py-flask/distinfo
index ab53a28c5fc4..dd7789fa3a5b 100644
--- a/www/py-flask/distinfo
+++ b/www/py-flask/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732758182
-SHA256 (flask-3.1.0.tar.gz) = 5f873c5184c897c8d9d1b05df1e3d01b14910ce69607a117bd3277098a5836ac
-SIZE (flask-3.1.0.tar.gz) = 680824
+TIMESTAMP = 1747179697
+SHA256 (flask-3.1.1.tar.gz) = 284c7b8f2f58cb737f0cf1c30fd7eaf0ccfcde196099d24ecede3fc2005aa59e
+SIZE (flask-3.1.1.tar.gz) = 753440
diff --git a/www/py-google-cloud-bigquery-storage/Makefile b/www/py-google-cloud-bigquery-storage/Makefile
index 14f1c2d6c9b4..66859731db0b 100644
--- a/www/py-google-cloud-bigquery-storage/Makefile
+++ b/www/py-google-cloud-bigquery-storage/Makefile
@@ -1,5 +1,5 @@
PORTNAME= google-cloud-bigquery-storage
-PORTVERSION= 2.30.0
+PORTVERSION= 2.31.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-google-cloud-bigquery-storage/distinfo b/www/py-google-cloud-bigquery-storage/distinfo
index 8da2a72d8824..80c2d08562c4 100644
--- a/www/py-google-cloud-bigquery-storage/distinfo
+++ b/www/py-google-cloud-bigquery-storage/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289066
-SHA256 (google_cloud_bigquery_storage-2.30.0.tar.gz) = 41ac83fa9eddbc820102177984ab92f8b7bbdfa7d90ea64b3a0af5ecb4fca3f2
-SIZE (google_cloud_bigquery_storage-2.30.0.tar.gz) = 256189
+TIMESTAMP = 1745936236
+SHA256 (google_cloud_bigquery_storage-2.31.0.tar.gz) = e4b42df3374dbc9575268c89d5dec47fced075c44904c463b12aed2b01be6790
+SIZE (google_cloud_bigquery_storage-2.31.0.tar.gz) = 256446
diff --git a/www/py-httpx-retries/Makefile b/www/py-httpx-retries/Makefile
index 7a76411077d8..a06943fcc8e0 100644
--- a/www/py-httpx-retries/Makefile
+++ b/www/py-httpx-retries/Makefile
@@ -1,5 +1,5 @@
PORTNAME= httpx-retries
-PORTVERSION= 0.3.2
+DISTVERSION= 0.4.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-httpx-retries/distinfo b/www/py-httpx-retries/distinfo
index 8252ea8abcbe..4ef455958702 100644
--- a/www/py-httpx-retries/distinfo
+++ b/www/py-httpx-retries/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745649955
-SHA256 (httpx_retries-0.3.2.tar.gz) = af2cc82f18e9196612e3c73aba027982450b6581f565af659dd8f5c884e991e0
-SIZE (httpx_retries-0.3.2.tar.gz) = 12530
+TIMESTAMP = 1747637137
+SHA256 (httpx_retries-0.4.0.tar.gz) = a7aa513e3f1eef347aac69adecfad9f421210a84df88c88f935ec130f98e6642
+SIZE (httpx_retries-0.4.0.tar.gz) = 12571
diff --git a/www/py-httpx/Makefile b/www/py-httpx/Makefile
index 7ae14d321903..2133bb749d43 100644
--- a/www/py-httpx/Makefile
+++ b/www/py-httpx/Makefile
@@ -1,5 +1,6 @@
PORTNAME= httpx
PORTVERSION= 0.28.1
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -32,7 +33,7 @@ OPTIONS_DEFAULT=HTTP2 SOCKS
BROTLI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}brotli>=0:archivers/py-brotli@${PY_FLAVOR}
CLI_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=8<9:devel/py-click@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pygments>=2<3:textproc/py-pygments@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}rich>=10<14:textproc/py-rich@${PY_FLAVOR}
+ ${PYTHON_PKGNAMEPREFIX}rich>=10<15:textproc/py-rich@${PY_FLAVOR}
HTTP2_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}h2>=3<5:www/py-h2@${PY_FLAVOR}
SOCKS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}socksio>=1<2:net/py-socksio@${PY_FLAVOR}
ZSTD_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zstandard>=0.18.0:archivers/py-zstandard@${PY_FLAVOR}
diff --git a/www/py-httpx/files/patch-pyproject.toml b/www/py-httpx/files/patch-pyproject.toml
new file mode 100644
index 000000000000..971b34aa71c3
--- /dev/null
+++ b/www/py-httpx/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig 2020-02-02 00:00:00 UTC
++++ pyproject.toml
+@@ -43,7 +43,7 @@ cli = [
+ cli = [
+ "click==8.*",
+ "pygments==2.*",
+- "rich>=10,<14",
++ "rich>=10,<15",
+ ]
+ http2 = [
+ "h2>=3,<5",
diff --git a/www/py-jh2/Makefile b/www/py-jh2/Makefile
index 2215938e79bc..06253cee0474 100644
--- a/www/py-jh2/Makefile
+++ b/www/py-jh2/Makefile
@@ -1,6 +1,5 @@
PORTNAME= jh2
-PORTVERSION= 5.0.8
-PORTREVISION= 1
+PORTVERSION= 5.0.9
CATEGORIES= www python
MASTER_SITES= PYPI \
https://github.com/jawah/h2/releases/download/v${PORTVERSION}/
diff --git a/www/py-jh2/Makefile.crates b/www/py-jh2/Makefile.crates
index d3de843652c5..b3079b8d7067 100644
--- a/www/py-jh2/Makefile.crates
+++ b/www/py-jh2/Makefile.crates
@@ -1,24 +1,24 @@
CARGO_CRATES= autocfg-1.4.0 \
- cc-1.2.16 \
+ cc-1.2.19 \
cfg-if-1.0.0 \
heck-0.5.0 \
httlib-hpack-0.1.3 \
httlib-huffman-0.3.4 \
indoc-2.0.6 \
- libc-0.2.170 \
+ libc-0.2.172 \
memoffset-0.9.1 \
- once_cell-1.20.3 \
+ once_cell-1.21.3 \
portable-atomic-1.11.0 \
- proc-macro2-1.0.94 \
- pyo3-0.23.5 \
- pyo3-build-config-0.23.5 \
- pyo3-ffi-0.23.5 \
- pyo3-macros-0.23.5 \
- pyo3-macros-backend-0.23.5 \
+ proc-macro2-1.0.95 \
+ pyo3-0.24.1 \
+ pyo3-build-config-0.24.1 \
+ pyo3-ffi-0.24.1 \
+ pyo3-macros-0.24.1 \
+ pyo3-macros-backend-0.24.1 \
python3-dll-a-0.2.13 \
- quote-1.0.39 \
+ quote-1.0.40 \
shlex-1.3.0 \
- syn-2.0.99 \
- target-lexicon-0.12.16 \
+ syn-2.0.100 \
+ target-lexicon-0.13.2 \
unicode-ident-1.0.18 \
unindent-0.2.4
diff --git a/www/py-jh2/distinfo b/www/py-jh2/distinfo
index 493d67aa0556..50b85c43e3a6 100644
--- a/www/py-jh2/distinfo
+++ b/www/py-jh2/distinfo
@@ -1,10 +1,10 @@
-TIMESTAMP = 1742070482
-SHA256 (jh2-5.0.8.tar.gz) = ad91f57c3485d87a8edee558dafab0f08c716857d748731c0998dcefe9d3fd5f
-SIZE (jh2-5.0.8.tar.gz) = 7301745
+TIMESTAMP = 1745936238
+SHA256 (jh2-5.0.9.tar.gz) = bec06ebc7d37beba62503c955d90580cfa1e5fff2b44f05cebecf2378b7f54b1
+SIZE (jh2-5.0.9.tar.gz) = 7301710
SHA256 (rust/crates/autocfg-1.4.0.crate) = ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26
SIZE (rust/crates/autocfg-1.4.0.crate) = 17712
-SHA256 (rust/crates/cc-1.2.16.crate) = be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c
-SIZE (rust/crates/cc-1.2.16.crate) = 103847
+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/heck-0.5.0.crate) = 2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea
@@ -15,36 +15,36 @@ SHA256 (rust/crates/httlib-huffman-0.3.4.crate) = 1a9fcbcc408c5526c3ab80d534e5c8
SIZE (rust/crates/httlib-huffman-0.3.4.crate) = 32157
SHA256 (rust/crates/indoc-2.0.6.crate) = f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd
SIZE (rust/crates/indoc-2.0.6.crate) = 17164
-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/memoffset-0.9.1.crate) = 488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a
SIZE (rust/crates/memoffset-0.9.1.crate) = 9032
-SHA256 (rust/crates/once_cell-1.20.3.crate) = 945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e
-SIZE (rust/crates/once_cell-1.20.3.crate) = 33456
+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/proc-macro2-1.0.94.crate) = a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84
-SIZE (rust/crates/proc-macro2-1.0.94.crate) = 52391
-SHA256 (rust/crates/pyo3-0.23.5.crate) = 7778bffd85cf38175ac1f545509665d0b9b92a198ca7941f131f85f7a4f9a872
-SIZE (rust/crates/pyo3-0.23.5.crate) = 1088533
-SHA256 (rust/crates/pyo3-build-config-0.23.5.crate) = 94f6cbe86ef3bf18998d9df6e0f3fc1050a8c5efa409bf712e661a4366e010fb
-SIZE (rust/crates/pyo3-build-config-0.23.5.crate) = 33885
-SHA256 (rust/crates/pyo3-ffi-0.23.5.crate) = e9f1b4c431c0bb1c8fb0a338709859eed0d030ff6daa34368d3b152a63dfdd8d
-SIZE (rust/crates/pyo3-ffi-0.23.5.crate) = 74867
-SHA256 (rust/crates/pyo3-macros-0.23.5.crate) = fbc2201328f63c4710f68abdf653c89d8dbc2858b88c5d88b0ff38a75288a9da
-SIZE (rust/crates/pyo3-macros-0.23.5.crate) = 8856
-SHA256 (rust/crates/pyo3-macros-backend-0.23.5.crate) = fca6726ad0f3da9c9de093d6f116a93c1a38e417ed73bf138472cf4064f72028
-SIZE (rust/crates/pyo3-macros-backend-0.23.5.crate) = 70938
+SHA256 (rust/crates/proc-macro2-1.0.95.crate) = 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778
+SIZE (rust/crates/proc-macro2-1.0.95.crate) = 51820
+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-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.39.crate) = c1f1914ce909e1658d9907913b4b91947430c7d9be598b15a1912935b8c04801
-SIZE (rust/crates/quote-1.0.39.crate) = 31206
+SHA256 (rust/crates/quote-1.0.40.crate) = 1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d
+SIZE (rust/crates/quote-1.0.40.crate) = 31063
SHA256 (rust/crates/shlex-1.3.0.crate) = 0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64
SIZE (rust/crates/shlex-1.3.0.crate) = 18713
-SHA256 (rust/crates/syn-2.0.99.crate) = e02e925281e18ffd9d640e234264753c43edc62d64b2d4cf898f1bc5e75f3fc2
-SIZE (rust/crates/syn-2.0.99.crate) = 297762
-SHA256 (rust/crates/target-lexicon-0.12.16.crate) = 61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1
-SIZE (rust/crates/target-lexicon-0.12.16.crate) = 26488
+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/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
diff --git a/www/py-limits/Makefile b/www/py-limits/Makefile
index 1c58182198b3..b5d97aaf790e 100644
--- a/www/py-limits/Makefile
+++ b/www/py-limits/Makefile
@@ -1,6 +1,6 @@
PORTNAME= limits
PORTVERSION= 3.14.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +13,7 @@ LICENSE= MIT
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}deprecated>=1.2:devel/py-deprecated@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}importlib-resources>=1.3:devel/py-importlib-resources@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}packaging>=21<25:devel/py-packaging@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}packaging>=21<26:devel/py-packaging@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}typing-extensions>=0.8:devel/py-typing-extensions@${PY_FLAVOR}
USES= python
diff --git a/www/py-limits/files/patch-packaging b/www/py-limits/files/patch-packaging
new file mode 100644
index 000000000000..f8142b4b405b
--- /dev/null
+++ b/www/py-limits/files/patch-packaging
@@ -0,0 +1,7 @@
+--- requirements/main.txt.orig 2024-11-30 19:17:07 UTC
++++ requirements/main.txt
+@@ -1,3 +1,3 @@ deprecated>=1.2
+ deprecated>=1.2
+-packaging>=21,<25
++packaging>=21,<26
+ typing_extensions
diff --git a/www/py-notebook/Makefile b/www/py-notebook/Makefile
index a8ff2e0dc221..af2072474cc0 100644
--- a/www/py-notebook/Makefile
+++ b/www/py-notebook/Makefile
@@ -1,5 +1,5 @@
PORTNAME= notebook
-PORTVERSION= 7.4.0
+PORTVERSION= 7.4.2
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -44,7 +44,7 @@ TEST_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}hatch>=0:devel/py-hatch@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}strict-rfc3339>=0:devel/py-strict-rfc3339@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR}
-USES= cpe desktop-file-utils python:3.9+
+USES= cpe desktop-file-utils python
USE_PYTHON= pep517 concurrent autoplist pytest
NO_ARCH= yes
diff --git a/www/py-notebook/distinfo b/www/py-notebook/distinfo
index 1beeb0e8f927..3d7d221bd31d 100644
--- a/www/py-notebook/distinfo
+++ b/www/py-notebook/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289426
-SHA256 (notebook-7.4.0.tar.gz) = 581d88f83709d90ce738dfd1d759892b96e3cbbc9c4a989912ed6c6a08f0d3e8
-SIZE (notebook-7.4.0.tar.gz) = 13880491
+TIMESTAMP = 1747547544
+SHA256 (notebook-7.4.2.tar.gz) = e739defd28c3f615a6bfb0a2564bd75018a9cc6613aa00bbd9c15e68eed2de1b
+SIZE (notebook-7.4.2.tar.gz) = 13881273
diff --git a/www/py-planet/Makefile b/www/py-planet/Makefile
index 4c479ce0ef9d..cefc872e78c9 100644
--- a/www/py-planet/Makefile
+++ b/www/py-planet/Makefile
@@ -1,5 +1,5 @@
PORTNAME= planet
-PORTVERSION= 2.20.0
+PORTVERSION= 2.21.0
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-planet/distinfo b/www/py-planet/distinfo
index 4db165ad75b1..b1000ab3e9cb 100644
--- a/www/py-planet/distinfo
+++ b/www/py-planet/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289078
-SHA256 (planet-2.20.0.tar.gz) = 07707274ab3fe71d90cd0782b3ff79859f74bbc4a6e51a12674ef603882b3a2a
-SIZE (planet-2.20.0.tar.gz) = 3362524
+TIMESTAMP = 1747546596
+SHA256 (planet-2.21.0.tar.gz) = f97eeb2685715bc1fe8895b6d6ffc33baa2c6ed5f859a0b809b681fed35f2472
+SIZE (planet-2.21.0.tar.gz) = 3368034
diff --git a/www/py-pyjwt/Makefile b/www/py-pyjwt/Makefile
index cc9e18586479..bd28d9987f7c 100644
--- a/www/py-pyjwt/Makefile
+++ b/www/py-pyjwt/Makefile
@@ -1,9 +1,8 @@
PORTNAME= pyjwt
-PORTVERSION= 2.8.0
+PORTVERSION= 2.10.1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
-DISTNAME= PyJWT-${PORTVERSION}
MAINTAINER= sunpoet@FreeBSD.org
COMMENT= JSON Web Token implementation in Python
diff --git a/www/py-pyjwt/distinfo b/www/py-pyjwt/distinfo
index 9236614d6d07..16f33578c280 100644
--- a/www/py-pyjwt/distinfo
+++ b/www/py-pyjwt/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691070186
-SHA256 (PyJWT-2.8.0.tar.gz) = 57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de
-SIZE (PyJWT-2.8.0.tar.gz) = 78313
+TIMESTAMP = 1747546598
+SHA256 (pyjwt-2.10.1.tar.gz) = 3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953
+SIZE (pyjwt-2.10.1.tar.gz) = 87785
diff --git a/www/py-pyjwt/files/patch-pyproject.toml b/www/py-pyjwt/files/patch-pyproject.toml
new file mode 100644
index 000000000000..9eae71010c8f
--- /dev/null
+++ b/www/py-pyjwt/files/patch-pyproject.toml
@@ -0,0 +1,11 @@
+--- pyproject.toml.orig 2024-11-28 03:40:50 UTC
++++ pyproject.toml
+@@ -35,7 +35,7 @@ keywords = [
+ "token",
+ "web",
+ ]
+-name = "PyJWT"
++name = "pyjwt"
+ requires-python = ">=3.9"
+
+ [project.license]
diff --git a/www/py-pyjwt/files/patch-setup.cfg b/www/py-pyjwt/files/patch-setup.cfg
deleted file mode 100644
index 90cf0f471e12..000000000000
--- a/www/py-pyjwt/files/patch-setup.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
---- setup.cfg.orig 2023-05-09 20:04:10 UTC
-+++ setup.cfg
-@@ -1,5 +1,5 @@
- [metadata]
--name = PyJWT
-+name = pyjwt
- version = attr: jwt.__version__
- author = Jose Padilla
- author_email = hello@jpadilla.com
diff --git a/www/py-ticketutil/Makefile b/www/py-ticketutil/Makefile
index 8c5ab6bcc8e1..55d9157c79c6 100644
--- a/www/py-ticketutil/Makefile
+++ b/www/py-ticketutil/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ticketutil
-PORTVERSION= 1.8.1
+PORTVERSION= 1.8.2
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-ticketutil/distinfo b/www/py-ticketutil/distinfo
index e529a544f4af..8fc6bb24b03a 100644
--- a/www/py-ticketutil/distinfo
+++ b/www/py-ticketutil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745178112
-SHA256 (ticketutil-1.8.1.tar.gz) = adffb30435f19798b0ef39afe966a7c9e4d923bc5304b78f016f0b4e95b49b50
-SIZE (ticketutil-1.8.1.tar.gz) = 34107
+TIMESTAMP = 1747546600
+SHA256 (ticketutil-1.8.2.tar.gz) = ec4464a968b87c957b27c6e1b4fa17d647825a0e6dca03e60ed728abb233c5cb
+SIZE (ticketutil-1.8.2.tar.gz) = 34254
diff --git a/www/py-uvicorn/Makefile b/www/py-uvicorn/Makefile
index e716ad046844..a04cce247ee9 100644
--- a/www/py-uvicorn/Makefile
+++ b/www/py-uvicorn/Makefile
@@ -1,5 +1,5 @@
PORTNAME= uvicorn
-PORTVERSION= 0.34.1
+PORTVERSION= 0.34.2
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-uvicorn/distinfo b/www/py-uvicorn/distinfo
index 3476cd6cd669..9b41ba0b5ad4 100644
--- a/www/py-uvicorn/distinfo
+++ b/www/py-uvicorn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745178114
-SHA256 (uvicorn-0.34.1.tar.gz) = af981725fc4b7ffc5cb3b0e9eda6258a90c4b52cb2a83ce567ae0a7ae1757afc
-SIZE (uvicorn-0.34.1.tar.gz) = 76755
+TIMESTAMP = 1745936240
+SHA256 (uvicorn-0.34.2.tar.gz) = 0e929828f6186353a80b58ea719861d2629d766293b6d19baf086ba31d4f3328
+SIZE (uvicorn-0.34.2.tar.gz) = 76815
diff --git a/www/py-wagtail-localize/Makefile b/www/py-wagtail-localize/Makefile
index e2d28ba7fbbc..d5dadb4e222a 100644
--- a/www/py-wagtail-localize/Makefile
+++ b/www/py-wagtail-localize/Makefile
@@ -1,5 +1,5 @@
PORTNAME= wagtail-localize
-PORTVERSION= 1.11
+PORTVERSION= 1.12
CATEGORIES= www python
MASTER_SITES= PYPI
DISTNAME= wagtail_localize-${PORTVERSION}
@@ -14,7 +14,7 @@ LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}django42>=4.2<6.0:www/py-django42@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}flit-core>=3.2<4:devel/py-flit-core@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}flit-core>=3.11<4:devel/py-flit-core@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}polib>=1.1<2.0:devel/py-polib@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.0:devel/py-typing-extensions@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}wagtail>=5.2:www/py-wagtail@${PY_FLAVOR}
diff --git a/www/py-wagtail-localize/distinfo b/www/py-wagtail-localize/distinfo
index 0cc965295b3f..71fc74d92d0f 100644
--- a/www/py-wagtail-localize/distinfo
+++ b/www/py-wagtail-localize/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735227992
-SHA256 (wagtail_localize-1.11.tar.gz) = f9dac6c292b971575f7770752c47c8fb253237ef7f22ea2346f8d669711b8076
-SIZE (wagtail_localize-1.11.tar.gz) = 285009
+TIMESTAMP = 1747546602
+SHA256 (wagtail_localize-1.12.tar.gz) = 9e8587d111d38d0c69d4938cd3045fea27c3701ba35465d20e79d24b26b18b50
+SIZE (wagtail_localize-1.12.tar.gz) = 285669
diff --git a/www/py-wagtail-localize/files/patch-pyproject.toml b/www/py-wagtail-localize/files/patch-pyproject.toml
new file mode 100644
index 000000000000..68cda192cbf1
--- /dev/null
+++ b/www/py-wagtail-localize/files/patch-pyproject.toml
@@ -0,0 +1,12 @@
+--- pyproject.toml.orig 2025-05-07 07:54:51 UTC
++++ pyproject.toml
+@@ -8,8 +8,7 @@ readme = "README.md"
+ maintainers = [{name = "Dan Braghis", email="dan.braghis@torchbox.com"}]
+ description = "Translation plugin for Wagtail CMS"
+ readme = "README.md"
+-license = "BSD-3-Clause"
+-license-files = [ "LICENSE" ]
++license = { file = "LICENSE" }
+ classifiers = [
+ "Development Status :: 4 - Beta",
+ "Intended Audience :: Developers",
diff --git a/www/py-wagtail/Makefile b/www/py-wagtail/Makefile
index ec2f4cdf8fd1..1949f6e83e1e 100644
--- a/www/py-wagtail/Makefile
+++ b/www/py-wagtail/Makefile
@@ -1,5 +1,6 @@
PORTNAME= wagtail
PORTVERSION= 6.4.1
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= PYPI
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +22,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anyascii>=0.1.5:textproc/py-anyascii@${PY_FL
${PYTHON_PKGNAMEPREFIX}django-modelcluster>=6.2.1<7.0:www/py-django-modelcluster@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-permissionedforms>=0.1<1.0:www/py-django-permissionedforms@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-taggit>=5.0<7:www/py-django-taggit@${PY_FLAVOR} \
- ${PYTHON_PKGNAMEPREFIX}django-tasks>=0.6.1<0.7:www/py-django-tasks@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}django-tasks>=0.7<0.8:www/py-django-tasks@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}django-treebeard>=4.5.1<5.0:www/py-django-treebeard@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}djangorestframework>=3.15.1,1<4.0,1:www/py-djangorestframework@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}draftjs-exporter>=2.1.5<6.0:www/py-draftjs-exporter@${PY_FLAVOR} \
@@ -32,7 +33,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}anyascii>=0.1.5:textproc/py-anyascii@${PY_FL
${PYTHON_PKGNAMEPREFIX}telepath>=0.3.1<1:devel/py-telepath@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}willow>=1.8.0<2:graphics/py-willow@${PY_FLAVOR}
-USES= cpe python:3.9+ shebangfix
+USES= cpe python shebangfix
USE_PYTHON= autoplist concurrent pep517
NO_ARCH= yes
diff --git a/www/py-wagtail/files/patch-setup.py b/www/py-wagtail/files/patch-setup.py
new file mode 100644
index 000000000000..43d4a8051941
--- /dev/null
+++ b/www/py-wagtail/files/patch-setup.py
@@ -0,0 +1,13 @@
+Obtained from: https://github.com/wagtail/wagtail/commit/2fafac56fab59e8d13fa57d0f483844114a15374
+
+--- setup.py.orig 2025-02-21 16:19:57 UTC
++++ setup.py
+@@ -35,7 +35,7 @@ install_requires = [
+ "anyascii>=0.1.5",
+ "telepath>=0.3.1,<1",
+ "laces>=0.1,<0.2",
+- "django-tasks>=0.6.1,<0.7",
++ "django-tasks>=0.7,<0.8",
+ ]
+
+ # Testing dependencies
diff --git a/www/py-yt-dlp/Makefile b/www/py-yt-dlp/Makefile
index 61da405b9878..85f19b0721e6 100644
--- a/www/py-yt-dlp/Makefile
+++ b/www/py-yt-dlp/Makefile
@@ -1,5 +1,5 @@
PORTNAME= yt-dlp # www/py-yt-dlp is for extending yt-dlp, www/yt-dlp is an application for the end user
-DISTVERSION= 2025.03.31
+DISTVERSION= 2025.04.30
CATEGORIES= www
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-yt-dlp/distinfo b/www/py-yt-dlp/distinfo
index 0ec326a12366..8492ce6bf985 100644
--- a/www/py-yt-dlp/distinfo
+++ b/www/py-yt-dlp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743466254
-SHA256 (yt-dlp/2025.03.31/yt-dlp.tar.gz) = 23ab23b7dffada34f98ecbffc3da763834ee3b0d969d5d10f8436ca6c32ca9eb
-SIZE (yt-dlp/2025.03.31/yt-dlp.tar.gz) = 5918295
+TIMESTAMP = 1746804642
+SHA256 (yt-dlp/2025.04.30/yt-dlp.tar.gz) = feb3113fc38c1c0f987d2cfcb7366fed65fa508ff302e7bd8ac9be87c7774b31
+SIZE (yt-dlp/2025.04.30/yt-dlp.tar.gz) = 5947502
diff --git a/www/py-yt-dlp/pkg-plist b/www/py-yt-dlp/pkg-plist
index 0495fed3fd43..c13ff46a96be 100644
--- a/www/py-yt-dlp/pkg-plist
+++ b/www/py-yt-dlp/pkg-plist
@@ -414,6 +414,7 @@ bin/yt-dlp-devel
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/itv.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/ivi.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/ivideon.py
+%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/ivoox.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/iwara.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/ixigua.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/izlesene.py
@@ -639,6 +640,7 @@ bin/yt-dlp-devel
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/paramountplus.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/parler.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/parlview.py
+%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/parti.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/patreon.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/pbs.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/pearvideo.py
@@ -732,6 +734,7 @@ bin/yt-dlp-devel
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/rokfin.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/roosterteeth.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/rottentomatoes.py
+%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/roya.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/rozhlas.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/rte.py
%%PYTHON_SITELIBDIR%%/yt_dlp/extractor/rtl2.py
diff --git a/www/reproxy/Makefile b/www/reproxy/Makefile
index fcd3f054a2d9..c8c3d19d8495 100644
--- a/www/reproxy/Makefile
+++ b/www/reproxy/Makefile
@@ -1,7 +1,6 @@
PORTNAME= reproxy
-PORTVERSION= 1.1.1
+PORTVERSION= 1.2.3
DISTVERSIONPREFIX= v
-PORTREVISION= 5
CATEGORIES= www
MAINTAINER= danfe@FreeBSD.org
@@ -11,7 +10,7 @@ WWW= https://reproxy.io/
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= go:modules
+USES= go:1.23,modules
USE_GITHUB= yes
GH_ACCOUNT= umputun
diff --git a/www/reproxy/distinfo b/www/reproxy/distinfo
index a15b25cc08cb..6173629a2615 100644
--- a/www/reproxy/distinfo
+++ b/www/reproxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707197375
-SHA256 (umputun-reproxy-v1.1.1_GH0.tar.gz) = 595af6971ea6be9f5f4a3e92c9c9ad9024c93c353456cd3d8d9efa9786679c1e
-SIZE (umputun-reproxy-v1.1.1_GH0.tar.gz) = 3166619
+TIMESTAMP = 1740074776
+SHA256 (umputun-reproxy-v1.2.3_GH0.tar.gz) = 5156be192698e263134e486448de3099e389cdc508c4a311830f371395ecfe13
+SIZE (umputun-reproxy-v1.2.3_GH0.tar.gz) = 3449957
diff --git a/www/rubygem-actioncable-gitlab/Makefile b/www/rubygem-actioncable-gitlab/Makefile
new file mode 100644
index 000000000000..a6870b1ba8c0
--- /dev/null
+++ b/www/rubygem-actioncable-gitlab/Makefile
@@ -0,0 +1,28 @@
+PORTNAME= actioncable
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Structure many real-time application concerns into channels over a single WebSocket connection
+WWW= https://github.com/rails/rails/tree/main/actioncable \
+ https://rubyonrails.org/
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-nio4r>=2.0<3:devel/rubygem-nio4r \
+ rubygem-websocket-driver>=0.6.1:www/rubygem-websocket-driver \
+ rubygem-zeitwerk>=2.6<3:devel/rubygem-zeitwerk
+
+USES= gem
+
+NO_ARCH= yes
+
+PORTSCOUT= limit:^7\.1\.
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.mk>
diff --git a/www/rubygem-actioncable-gitlab/distinfo b/www/rubygem-actioncable-gitlab/distinfo
new file mode 100644
index 000000000000..3d467b025814
--- /dev/null
+++ b/www/rubygem-actioncable-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888822
+SHA256 (rubygem/actioncable-7.1.5.1.gem) = 764637b5b2d97b94e412d562c177bfd16b0fd769d55c98846362f5263e8aaa0d
+SIZE (rubygem/actioncable-7.1.5.1.gem) = 48128
diff --git a/www/rubygem-actioncable-gitlab/pkg-descr b/www/rubygem-actioncable-gitlab/pkg-descr
new file mode 100644
index 000000000000..5d7feb3ca8cf
--- /dev/null
+++ b/www/rubygem-actioncable-gitlab/pkg-descr
@@ -0,0 +1,7 @@
+Action Cable seamlessly integrates WebSockets with the rest of your Rails
+application. It allows for real-time features to be written in Ruby in the same
+style and form as the rest of your Rails application, while still being
+performant and scalable. It's a full-stack offering that provides both a
+client-side JavaScript framework and a server-side Ruby framework. You have
+access to your full domain model written with Active Record or your ORM of
+choice.
diff --git a/www/rubygem-actionpack-gitlab/Makefile b/www/rubygem-actionpack-gitlab/Makefile
new file mode 100644
index 000000000000..c9a5845999ee
--- /dev/null
+++ b/www/rubygem-actionpack-gitlab/Makefile
@@ -0,0 +1,32 @@
+PORTNAME= actionpack
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Action Controller and Action View of Rails MVC Framework
+WWW= https://github.com/rails/rails/tree/main/actionpack \
+ https://rubyonrails.org/
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-nokogiri>=1.8.5:textproc/rubygem-nokogiri \
+ rubygem-racc>=0:devel/rubygem-racc \
+ rubygem-rack22>=2.2.4,3:www/rubygem-rack22 \
+ rubygem-rack-session10>=1.0.1:www/rubygem-rack-session10 \
+ rubygem-rack-test>=0.6.3:www/rubygem-rack-test \
+ rubygem-rails-dom-testing-rails-gitlab>=2.2<3:textproc/rubygem-rails-dom-testing-rails-gitlab \
+ rubygem-rails-html-sanitizer>=1.6<2:textproc/rubygem-rails-html-sanitizer
+
+USES= gem
+
+NO_ARCH= yes
+
+PORTSCOUT= limit:^7\.1\.
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.mk>
diff --git a/www/rubygem-actionpack-gitlab/distinfo b/www/rubygem-actionpack-gitlab/distinfo
new file mode 100644
index 000000000000..f78deede4ac7
--- /dev/null
+++ b/www/rubygem-actionpack-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888824
+SHA256 (rubygem/actionpack-7.1.5.1.gem) = 2bc263d9f43f16cc3b3360f59659ab11f140577602f371f1a968e2672b38d718
+SIZE (rubygem/actionpack-7.1.5.1.gem) = 246272
diff --git a/www/rubygem-actionpack-gitlab/pkg-descr b/www/rubygem-actionpack-gitlab/pkg-descr
new file mode 100644
index 000000000000..2f8df748c74a
--- /dev/null
+++ b/www/rubygem-actionpack-gitlab/pkg-descr
@@ -0,0 +1,19 @@
+Action Pack is a framework for handling and responding to web requests. It
+provides mechanisms for routing (mapping request URLs to actions), defining
+controllers that implement actions, and generating responses. In short, Action
+Pack provides the controller layer in the MVC paradigm.
+
+It consists of several modules:
+- Action Dispatch, which parses information about the web request, handles
+ routing as defined by the user, and does advanced processing related to HTTP
+ such as MIME-type negotiation, decoding parameters in POST, PATCH, or PUT
+ bodies, handling HTTP caching logic, cookies and sessions.
+- Action Controller, which provides a base controller class that can be
+ subclassed to implement filters and actions to handle requests. The result of
+ an action is typically content generated from views.
+
+With the Ruby on Rails framework, users only directly interface with the Action
+Controller module. Necessary Action Dispatch functionality is activated by
+default and Action View rendering is implicitly triggered by Action Controller.
+However, these modules are designed to function on their own and can be used
+outside of Rails.
diff --git a/www/rubygem-async-http/Makefile b/www/rubygem-async-http/Makefile
index 0ccaf9648843..3ecafed0173a 100644
--- a/www/rubygem-async-http/Makefile
+++ b/www/rubygem-async-http/Makefile
@@ -1,5 +1,5 @@
PORTNAME= async-http
-PORTVERSION= 0.88.0
+PORTVERSION= 0.89.0
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-async-http/distinfo b/www/rubygem-async-http/distinfo
index 26af13420772..c15ed41a518f 100644
--- a/www/rubygem-async-http/distinfo
+++ b/www/rubygem-async-http/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070754
-SHA256 (rubygem/async-http-0.88.0.gem) = c568743f0606f283b208b7c6adee9070c5e8f59867bf17028bafa5a6ea412f99
-SIZE (rubygem/async-http-0.88.0.gem) = 36864
+TIMESTAMP = 1745936428
+SHA256 (rubygem/async-http-0.89.0.gem) = 1a40728cf38ec4c3eff121474bd4f218237ffff177e471ca677b57d7aa436682
+SIZE (rubygem/async-http-0.89.0.gem) = 36864
diff --git a/www/rubygem-coverband/Makefile b/www/rubygem-coverband/Makefile
index 8fd3618b83c0..2e1e1e7adbc2 100644
--- a/www/rubygem-coverband/Makefile
+++ b/www/rubygem-coverband/Makefile
@@ -1,5 +1,5 @@
PORTNAME= coverband
-PORTVERSION= 6.1.4
+PORTVERSION= 6.1.5
CATEGORIES= www rubygems
MASTER_SITES= RG
@@ -10,7 +10,8 @@ WWW= https://github.com/danmayer/coverband
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-RUN_DEPENDS= rubygem-redis>=3.0:databases/rubygem-redis
+RUN_DEPENDS= rubygem-base64>=0:converters/rubygem-base64 \
+ rubygem-redis>=3.0:databases/rubygem-redis
USES= gem shebangfix
diff --git a/www/rubygem-coverband/distinfo b/www/rubygem-coverband/distinfo
index 6a23f094326a..4920d2de9087 100644
--- a/www/rubygem-coverband/distinfo
+++ b/www/rubygem-coverband/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1732165897
-SHA256 (rubygem/coverband-6.1.4.gem) = 65cf398e6dd00ea7ec71381dc90bf7636b76799fba1f3f48871d746b350e17c8
-SIZE (rubygem/coverband-6.1.4.gem) = 211456
+TIMESTAMP = 1747309426
+SHA256 (rubygem/coverband-6.1.5.gem) = 45173be9b00f70c1700d5a0d5bde1d553288862741dc5c602c58d3b3fb0f8225
+SIZE (rubygem/coverband-6.1.5.gem) = 212480
diff --git a/www/rubygem-cssbundling-rails-rails-gitlab/Makefile b/www/rubygem-cssbundling-rails-rails-gitlab/Makefile
new file mode 100644
index 000000000000..87c19ec0b992
--- /dev/null
+++ b/www/rubygem-cssbundling-rails-rails-gitlab/Makefile
@@ -0,0 +1,20 @@
+PORTNAME= cssbundling-rails
+PORTVERSION= 1.4.3
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Bundle and process CSS with Tailwind, Bootstrap, PostCSS, Sass in Rails via Node.js
+WWW= https://github.com/rails/cssbundling-rails
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-railties-gitlab>=6.0.0:www/rubygem-railties-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-cssbundling-rails-rails-gitlab/distinfo b/www/rubygem-cssbundling-rails-rails-gitlab/distinfo
new file mode 100644
index 000000000000..f2cba7b71cfe
--- /dev/null
+++ b/www/rubygem-cssbundling-rails-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1742070756
+SHA256 (rubygem/cssbundling-rails-1.4.3.gem) = 53aecd5a7d24ac9c8fcd92975acd0e830fead4ee4583d3d3d49bb64651946e41
+SIZE (rubygem/cssbundling-rails-1.4.3.gem) = 11776
diff --git a/www/rubygem-cssbundling-rails-rails-gitlab/pkg-descr b/www/rubygem-cssbundling-rails-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..3bf0ef49a085
--- /dev/null
+++ b/www/rubygem-cssbundling-rails-rails-gitlab/pkg-descr
@@ -0,0 +1,12 @@
+Use Tailwind CSS, Bootstrap, Bulma, PostCSS, or Dart Sass to bundle and process
+your CSS, then deliver it via the asset pipeline in Rails. This gem provides
+installers to get you going with the bundler of your choice in a new Rails
+application, and a convention to use app/assets/builds to hold your bundled
+output as artifacts that are not checked into source control (the installer adds
+this directory to .gitignore by default).
+
+You develop using this approach by running the bundler in watch mode in a
+terminal with yarn build:css --watch (and your Rails server in another, if
+you're not using something like puma-dev). You can also use ./bin/dev, which
+will start both the Rails server and the CSS build watcher (along with a JS
+build watcher, if you're also using jsbundling-rails).
diff --git a/www/rubygem-faraday/Makefile b/www/rubygem-faraday/Makefile
index 82dbd72f9d36..51801fa2b86c 100644
--- a/www/rubygem-faraday/Makefile
+++ b/www/rubygem-faraday/Makefile
@@ -1,5 +1,5 @@
PORTNAME= faraday
-PORTVERSION= 2.13.0
+PORTVERSION= 2.13.1
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-faraday/distinfo b/www/rubygem-faraday/distinfo
index 4214c9ffb641..cdd505c930de 100644
--- a/www/rubygem-faraday/distinfo
+++ b/www/rubygem-faraday/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289352
-SHA256 (rubygem/faraday-2.13.0.gem) = f2697cd61a434dc446ee035f0370de654c2ad64707c4fc2541eb2338702e9614
-SIZE (rubygem/faraday-2.13.0.gem) = 73728
+TIMESTAMP = 1745936430
+SHA256 (rubygem/faraday-2.13.1.gem) = cc531eb5467e7d74d4517630fa96f1a7003647cbf20a9a3e067d098941217b75
+SIZE (rubygem/faraday-2.13.1.gem) = 74240
diff --git a/www/rubygem-gon-rails-gitlab/Makefile b/www/rubygem-gon-rails-gitlab/Makefile
new file mode 100644
index 000000000000..d233ce4c6716
--- /dev/null
+++ b/www/rubygem-gon-rails-gitlab/Makefile
@@ -0,0 +1,24 @@
+PORTNAME= gon
+PORTVERSION= 6.4.0
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Framework to pass data to JS easily
+WWW= https://github.com/gazay/gon
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=3.0.20:www/rubygem-actionpack-gitlab \
+ rubygem-i18n>=0.7:devel/rubygem-i18n \
+ rubygem-multi_json>=0:devel/rubygem-multi_json \
+ rubygem-request_store>=1.0:devel/rubygem-request_store
+
+USES= cpe gem
+CPE_VENDOR= ${PORTNAME}_project
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-gon-rails-gitlab/distinfo b/www/rubygem-gon-rails-gitlab/distinfo
new file mode 100644
index 000000000000..70a568978163
--- /dev/null
+++ b/www/rubygem-gon-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1619177531
+SHA256 (rubygem/gon-6.4.0.gem) = e3a618d659392890f1aa7db420f17c75fd7d35aeb5f8fe003697d02c4b88d2f0
+SIZE (rubygem/gon-6.4.0.gem) = 158720
diff --git a/www/rubygem-gon-rails-gitlab/pkg-descr b/www/rubygem-gon-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..f3dfc03b45c8
--- /dev/null
+++ b/www/rubygem-gon-rails-gitlab/pkg-descr
@@ -0,0 +1,2 @@
+If you need to send some data to your js files and you don't want to do this
+with long way trough views and parsing - use this force!
diff --git a/www/rubygem-jquery-ui-rails-rails4/Makefile b/www/rubygem-jquery-ui-rails-rails4/Makefile
index d4c6c574e9c3..d0e0bbb5cdd5 100644
--- a/www/rubygem-jquery-ui-rails-rails4/Makefile
+++ b/www/rubygem-jquery-ui-rails-rails4/Makefile
@@ -1,5 +1,5 @@
PORTNAME= jquery-ui-rails
-PORTVERSION= 7.0.0
+PORTVERSION= 8.0.0
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMESUFFIX= -rails4
diff --git a/www/rubygem-jquery-ui-rails-rails4/distinfo b/www/rubygem-jquery-ui-rails-rails4/distinfo
index ddc8ce67a713..5b42c367ce30 100644
--- a/www/rubygem-jquery-ui-rails-rails4/distinfo
+++ b/www/rubygem-jquery-ui-rails-rails4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1711466452
-SHA256 (rubygem/jquery-ui-rails-7.0.0.gem) = e2b41a6fd987e6391a668d89bb34e09d5d292bf5651056d94911f5a915610478
-SIZE (rubygem/jquery-ui-rails-7.0.0.gem) = 190464
+TIMESTAMP = 1747547560
+SHA256 (rubygem/jquery-ui-rails-8.0.0.gem) = e198f0ccd84587bc1030e79333db5fdb1100c8d459ed378ff285f57720f6b9c9
+SIZE (rubygem/jquery-ui-rails-8.0.0.gem) = 186880
diff --git a/www/rubygem-kaminari-actionview-rails-gitlab/Makefile b/www/rubygem-kaminari-actionview-rails-gitlab/Makefile
new file mode 100644
index 000000000000..954983f1e9fa
--- /dev/null
+++ b/www/rubygem-kaminari-actionview-rails-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= kaminari-actionview
+PORTVERSION= 1.2.2
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Kaminari Action View adapter
+WWW= https://github.com/kaminari/kaminari/tree/master/kaminari-actionview
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionview-gitlab>=0:devel/rubygem-actionview-gitlab \
+ rubygem-kaminari-core>=${PORTVERSION}:www/rubygem-kaminari-core
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-kaminari-actionview-rails-gitlab/distinfo b/www/rubygem-kaminari-actionview-rails-gitlab/distinfo
new file mode 100644
index 000000000000..9e9ced8bcaa2
--- /dev/null
+++ b/www/rubygem-kaminari-actionview-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1641046940
+SHA256 (rubygem/kaminari-actionview-1.2.2.gem) = 1330f6fc8b59a4a4ef6a549ff8a224797289ebf7a3a503e8c1652535287cc909
+SIZE (rubygem/kaminari-actionview-1.2.2.gem) = 6656
diff --git a/www/rubygem-kaminari-actionview-rails-gitlab/pkg-descr b/www/rubygem-kaminari-actionview-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..e0618fca67d8
--- /dev/null
+++ b/www/rubygem-kaminari-actionview-rails-gitlab/pkg-descr
@@ -0,0 +1 @@
+kaminari-actionview provides pagination helpers for your Action View templates.
diff --git a/www/rubygem-kaminari-activerecord-rails-gitlab/Makefile b/www/rubygem-kaminari-activerecord-rails-gitlab/Makefile
new file mode 100644
index 000000000000..b11458d6b41b
--- /dev/null
+++ b/www/rubygem-kaminari-activerecord-rails-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= kaminari-activerecord
+PORTVERSION= 1.2.2
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Kaminari Active Record adapter
+WWW= https://github.com/kaminari/kaminari/tree/master/kaminari-activerecord
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-activerecord-gitlab>=0:databases/rubygem-activerecord-gitlab \
+ rubygem-kaminari-core>=${PORTVERSION}:www/rubygem-kaminari-core
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-kaminari-activerecord-rails-gitlab/distinfo b/www/rubygem-kaminari-activerecord-rails-gitlab/distinfo
new file mode 100644
index 000000000000..85db9296f918
--- /dev/null
+++ b/www/rubygem-kaminari-activerecord-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1641046950
+SHA256 (rubygem/kaminari-activerecord-1.2.2.gem) = 0dd3a67bab356a356f36b3b7236bcb81cef313095365befe8e98057dd2472430
+SIZE (rubygem/kaminari-activerecord-1.2.2.gem) = 8192
diff --git a/www/rubygem-kaminari-activerecord-rails-gitlab/pkg-descr b/www/rubygem-kaminari-activerecord-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..f668bf61ed99
--- /dev/null
+++ b/www/rubygem-kaminari-activerecord-rails-gitlab/pkg-descr
@@ -0,0 +1 @@
+kaminari-activerecord lets your Active Record models be paginatable.
diff --git a/www/rubygem-kaminari-rails-gitlab/Makefile b/www/rubygem-kaminari-rails-gitlab/Makefile
new file mode 100644
index 000000000000..70015842acd4
--- /dev/null
+++ b/www/rubygem-kaminari-rails-gitlab/Makefile
@@ -0,0 +1,25 @@
+PORTNAME= kaminari
+PORTVERSION= 1.2.2
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Sophisticated paginator for Rails 4+
+WWW= https://github.com/kaminari/kaminari
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-activesupport-gitlab>=4.1.0:devel/rubygem-activesupport-gitlab \
+ rubygem-kaminari-actionview-rails-gitlab>=${PORTVERSION}:www/rubygem-kaminari-actionview-rails-gitlab \
+ rubygem-kaminari-activerecord-rails-gitlab>=${PORTVERSION}:www/rubygem-kaminari-activerecord-rails-gitlab \
+ rubygem-kaminari-core>=${PORTVERSION}:www/rubygem-kaminari-core
+
+USES= cpe gem
+
+NO_ARCH= yes
+
+CPE_VENDOR= kaminari_project
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-kaminari-rails-gitlab/distinfo b/www/rubygem-kaminari-rails-gitlab/distinfo
new file mode 100644
index 000000000000..f8e7efd0cf3a
--- /dev/null
+++ b/www/rubygem-kaminari-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1641046962
+SHA256 (rubygem/kaminari-1.2.2.gem) = c4076ff9adccc6109408333f87b5c4abbda5e39dc464bd4c66d06d9f73442a3e
+SIZE (rubygem/kaminari-1.2.2.gem) = 23552
diff --git a/www/rubygem-kaminari-rails-gitlab/pkg-descr b/www/rubygem-kaminari-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..9f20e0a09f60
--- /dev/null
+++ b/www/rubygem-kaminari-rails-gitlab/pkg-descr
@@ -0,0 +1,2 @@
+Kaminari is a Scope & Engine based, clean, powerful, agnostic, customizable and
+sophisticated paginator for Rails 3
diff --git a/www/rubygem-lograge-rails-gitlab/Makefile b/www/rubygem-lograge-rails-gitlab/Makefile
new file mode 100644
index 000000000000..be924d3cc367
--- /dev/null
+++ b/www/rubygem-lograge-rails-gitlab/Makefile
@@ -0,0 +1,22 @@
+PORTNAME= lograge
+PORTVERSION= 0.14.0
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= ruby@FreeBSD.org
+COMMENT= Tame Rails' multi-line logging into a single line per request #'
+WWW= https://github.com/roidrage/lograge
+
+LICENSE= MIT
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=4:www/rubygem-actionpack-gitlab \
+ rubygem-activesupport-gitlab>=4:devel/rubygem-activesupport-gitlab \
+ rubygem-railties-gitlab>=4:www/rubygem-railties-gitlab \
+ rubygem-request_store>=1.0<2:devel/rubygem-request_store
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-lograge-rails-gitlab/distinfo b/www/rubygem-lograge-rails-gitlab/distinfo
new file mode 100644
index 000000000000..e43a648f18f6
--- /dev/null
+++ b/www/rubygem-lograge-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1697030448
+SHA256 (rubygem/lograge-0.14.0.gem) = 42371a75823775f166f727639f5ddce73dd149452a55fc94b90c303213dc9ae1
+SIZE (rubygem/lograge-0.14.0.gem) = 11264
diff --git a/www/rubygem-lograge-rails-gitlab/pkg-descr b/www/rubygem-lograge-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..e7f52af2c168
--- /dev/null
+++ b/www/rubygem-lograge-rails-gitlab/pkg-descr
@@ -0,0 +1,6 @@
+Tame Rails' multi-line logging into a single line per request
+
+Lograge is an attempt to bring sanity to Rails' noisy and unusable, unparsable
+and, in the context of running multiple processes and servers, unreadable
+default logging output. Rails' default approach to log everything is great
+during development, it's terrible when running it in production.
diff --git a/www/rubygem-protocol-http/Makefile b/www/rubygem-protocol-http/Makefile
index c770ad1f5244..35879e8f3b95 100644
--- a/www/rubygem-protocol-http/Makefile
+++ b/www/rubygem-protocol-http/Makefile
@@ -1,5 +1,5 @@
PORTNAME= protocol-http
-PORTVERSION= 0.49.0
+PORTVERSION= 0.50.1
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-protocol-http/distinfo b/www/rubygem-protocol-http/distinfo
index 6b0429be46ce..5724bc65338c 100644
--- a/www/rubygem-protocol-http/distinfo
+++ b/www/rubygem-protocol-http/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738606635
-SHA256 (rubygem/protocol-http-0.49.0.gem) = b5419aa60ea74912db2658d16722f23ee37229ca497b1d1413f50f6c04f577b7
-SIZE (rubygem/protocol-http-0.49.0.gem) = 43520
+TIMESTAMP = 1747547532
+SHA256 (rubygem/protocol-http-0.50.1.gem) = b868f493624c30c8711f73a91e9449351e2cd3f328262aef90bbaf0fb17f1f2a
+SIZE (rubygem/protocol-http-0.50.1.gem) = 43520
diff --git a/www/rubygem-protocol-rack/Makefile b/www/rubygem-protocol-rack/Makefile
index 6f19f4660be9..9aefc24e7f47 100644
--- a/www/rubygem-protocol-rack/Makefile
+++ b/www/rubygem-protocol-rack/Makefile
@@ -1,5 +1,5 @@
PORTNAME= protocol-rack
-PORTVERSION= 0.11.2
+PORTVERSION= 0.12.0
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-protocol-rack/distinfo b/www/rubygem-protocol-rack/distinfo
index 816b2429c823..c39469521d8a 100644
--- a/www/rubygem-protocol-rack/distinfo
+++ b/www/rubygem-protocol-rack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070764
-SHA256 (rubygem/protocol-rack-0.11.2.gem) = 49417e1608e9c7612f7a45d0324d427e7fd4a14f09e9b38d4993c58a5304f7f0
-SIZE (rubygem/protocol-rack-0.11.2.gem) = 18432
+TIMESTAMP = 1747547534
+SHA256 (rubygem/protocol-rack-0.12.0.gem) = 1f058c4352f09c2bab600aea16824536bcc6ed36d4b944fff91c446494ce9e33
+SIZE (rubygem/protocol-rack-0.12.0.gem) = 18432
diff --git a/www/rubygem-rack-session/Makefile b/www/rubygem-rack-session/Makefile
index 8a94dd177ec1..bf2f4d2ed20b 100644
--- a/www/rubygem-rack-session/Makefile
+++ b/www/rubygem-rack-session/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rack-session
-PORTVERSION= 2.1.0
+PORTVERSION= 2.1.1
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-rack-session/distinfo b/www/rubygem-rack-session/distinfo
index c29c2e86650f..6cad5fc12915 100644
--- a/www/rubygem-rack-session/distinfo
+++ b/www/rubygem-rack-session/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1738090170
-SHA256 (rubygem/rack-session-2.1.0.gem) = 437c3916535b58ef71c816ce4a2dee0a01c8a52ae6077dc2b6cd19085760a290
-SIZE (rubygem/rack-session-2.1.0.gem) = 15872
+TIMESTAMP = 1747547538
+SHA256 (rubygem/rack-session-2.1.1.gem) = 0b6dc07dea7e4b583f58a48e8b806d4c9f1c6c9214ebc202ec94562cbea2e4e9
+SIZE (rubygem/rack-session-2.1.1.gem) = 15872
diff --git a/www/rubygem-rack/Makefile b/www/rubygem-rack/Makefile
index ad340563bb20..9aebc059ceda 100644
--- a/www/rubygem-rack/Makefile
+++ b/www/rubygem-rack/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rack
-PORTVERSION= 3.1.13
+PORTVERSION= 3.1.14
PORTEPOCH= 3
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-rack/distinfo b/www/rubygem-rack/distinfo
index 39219c0b066c..d04c30821a38 100644
--- a/www/rubygem-rack/distinfo
+++ b/www/rubygem-rack/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745178246
-SHA256 (rubygem/rack-3.1.13.gem) = 170c79db621882884d9a28d9cd5bd228c663fddcd367c4dea22c9a1808645792
-SIZE (rubygem/rack-3.1.13.gem) = 112128
+TIMESTAMP = 1747547536
+SHA256 (rubygem/rack-3.1.14.gem) = 84613c2a8df193bb6711d9c14ecc6d5a65a7cb4312379a65e793562608944b44
+SIZE (rubygem/rack-3.1.14.gem) = 113152
diff --git a/www/rubygem-rack22/Makefile b/www/rubygem-rack22/Makefile
index 90cee1aa5dd1..9a48061a7a5d 100644
--- a/www/rubygem-rack22/Makefile
+++ b/www/rubygem-rack22/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rack
-PORTVERSION= 2.2.13
+PORTVERSION= 2.2.14
PORTEPOCH= 3
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-rack22/distinfo b/www/rubygem-rack22/distinfo
index c8837452c551..bef8c7c04873 100644
--- a/www/rubygem-rack22/distinfo
+++ b/www/rubygem-rack22/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070768
-SHA256 (rubygem/rack-2.2.13.gem) = ccee101719696a5da12ee9da6fb3b1d20cb329939e089e0e458be6e93667f0fb
-SIZE (rubygem/rack-2.2.13.gem) = 152576
+TIMESTAMP = 1747547540
+SHA256 (rubygem/rack-2.2.14.gem) = 76195d66a344087f28398b2f513da5a46641a4c3eb6d361e1b330c8ea72eed53
+SIZE (rubygem/rack-2.2.14.gem) = 153088
diff --git a/www/rubygem-rails-gitlab/Makefile b/www/rubygem-rails-gitlab/Makefile
new file mode 100644
index 000000000000..fad6645b5e89
--- /dev/null
+++ b/www/rubygem-rails-gitlab/Makefile
@@ -0,0 +1,49 @@
+PORTNAME= rails
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Full-stack web application framework
+WWW= https://rubyonrails.org/ \
+ https://github.com/rails/rails
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actioncable-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actioncable-gitlab \
+ rubygem-actionmailbox-gitlab>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailbox-gitlab \
+ rubygem-actionmailer-gitlab>=${PORTVERSION}<${PORTVERSION}_99:mail/rubygem-actionmailer-gitlab \
+ rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \
+ rubygem-actiontext-gitlab>=${PORTVERSION}<${PORTVERSION}_99:textproc/rubygem-actiontext-gitlab \
+ rubygem-actionview-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-actionview-gitlab \
+ rubygem-activejob-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activejob-gitlab \
+ rubygem-activemodel-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activemodel-gitlab \
+ rubygem-activerecord-gitlab>=${PORTVERSION}<${PORTVERSION}_99:databases/rubygem-activerecord-gitlab \
+ rubygem-activestorage-gitlab>=${PORTVERSION}<${PORTVERSION}_99:net/rubygem-activestorage-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-bundler>=1.15.0:sysutils/rubygem-bundler \
+ rubygem-railties-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-railties-gitlab
+
+USES= cpe gem
+
+NO_ARCH= yes
+
+CPE_VENDOR= rubyonrails
+CPE_PRODUCT= ruby_on_rails
+
+PORTSCOUT= limit:^7\.1\.
+
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} <= 3.1
+RUN_DEPENDS+= rubygem-cgi>=0.3.6:www/rubygem-cgi
+.endif
+
+.if ${RUBY_VER} == 3.1
+RUN_DEPENDS+= rubygem-error_highlight>=0.4.0:devel/rubygem-error_highlight
+.endif
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.post.mk>
diff --git a/www/rubygem-rails-gitlab/distinfo b/www/rubygem-rails-gitlab/distinfo
new file mode 100644
index 000000000000..1ca3ce97bc6c
--- /dev/null
+++ b/www/rubygem-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888826
+SHA256 (rubygem/rails-7.1.5.1.gem) = 05aea2ed7b6392b41ce0fc11455de118455025a431b6ea334a7ac2b101608804
+SIZE (rubygem/rails-7.1.5.1.gem) = 7168
diff --git a/www/rubygem-rails-gitlab/pkg-descr b/www/rubygem-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..5936b0adc42e
--- /dev/null
+++ b/www/rubygem-rails-gitlab/pkg-descr
@@ -0,0 +1,23 @@
+Rails is a web-application framework that includes everything needed to create
+database-backed web applications according to the Model-View-Controller (MVC)
+pattern.
+
+Understanding the MVC pattern is key to understanding Rails. MVC divides your
+application into three layers: Model, View, and Controller, each with a specific
+responsibility.
+
+Active Record, Active Model, Action Pack, and Action View can each be used
+independently outside Rails.
+
+In addition to that, Rails also comes with:
+- Action Mailer, a library to generate and send emails
+- Action Mailbox, a library to receive emails within a Rails application
+- Active Job, a framework for declaring jobs and making them run on a variety of
+ queuing backends
+- Action Cable, a framework to integrate WebSockets with a Rails application
+- Active Storage, a library to attach cloud and local files to Rails
+ applications
+- Action Text, a library to handle rich text content
+- Active Support, a collection of utility classes and standard library
+ extensions that are useful for Rails, and may also be used independently
+ outside Rails
diff --git a/www/rubygem-railties-gitlab/Makefile b/www/rubygem-railties-gitlab/Makefile
new file mode 100644
index 000000000000..0ad939166601
--- /dev/null
+++ b/www/rubygem-railties-gitlab/Makefile
@@ -0,0 +1,36 @@
+PORTNAME= railties
+PORTVERSION= ${RAILS_VERSION}
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Rails internals: application bootup, plugins, generators, and rake tasks
+WWW= https://github.com/rails/rails/tree/master/railties \
+ https://rubyonrails.org/
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=${PORTVERSION}<${PORTVERSION}_99:www/rubygem-actionpack-gitlab \
+ rubygem-activesupport-gitlab>=${PORTVERSION}<${PORTVERSION}_99:devel/rubygem-activesupport-gitlab \
+ rubygem-irb-gitlab>=0:devel/rubygem-irb-gitlab \
+ rubygem-rackup10>=1.0.0:www/rubygem-rackup10 \
+ rubygem-rake>=12.2:devel/rubygem-rake \
+ rubygem-thor>=1.2.2<2:devel/rubygem-thor \
+ rubygem-zeitwerk>=2.6<3:devel/rubygem-zeitwerk
+
+USES= gem shebangfix
+
+NO_ARCH= yes
+
+PLIST_FILES= bin/rails
+
+CONFLICTS_INSTALL= rubygem-railties[0-9] rubygem-railties[0-9][0-9]
+
+PORTSCOUT= limit:^7\.1\.
+
+SHEBANG_FILES= lib/rails/generators/rails/app/templates/docker-entrypoint.tt
+
+.include "${.CURDIR}/../../www/gitlab/Makefile.common"
+.include <bsd.port.mk>
diff --git a/www/rubygem-railties-gitlab/distinfo b/www/rubygem-railties-gitlab/distinfo
new file mode 100644
index 000000000000..0650bb7c3d47
--- /dev/null
+++ b/www/rubygem-railties-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1734888828
+SHA256 (rubygem/railties-7.1.5.1.gem) = 0be15562e2ded4efdc1b6c30f884b6d838c9ba49573dde042334b752b043e2fb
+SIZE (rubygem/railties-7.1.5.1.gem) = 182272
diff --git a/www/rubygem-railties-gitlab/pkg-descr b/www/rubygem-railties-gitlab/pkg-descr
new file mode 100644
index 000000000000..fbc0144b3be4
--- /dev/null
+++ b/www/rubygem-railties-gitlab/pkg-descr
@@ -0,0 +1,4 @@
+Railties is responsible for gluing all frameworks together. Overall, it:
+- handles the bootstrapping process for a Rails application;
+- manages the rails command line interface;
+- and provides the Rails generators core.
diff --git a/www/rubygem-redis-rack-gitlab/Makefile b/www/rubygem-redis-rack-gitlab/Makefile
new file mode 100644
index 000000000000..f330ace9ea51
--- /dev/null
+++ b/www/rubygem-redis-rack-gitlab/Makefile
@@ -0,0 +1,25 @@
+PORTNAME= redis-rack
+PORTVERSION= 3.0.0
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Redis Store for Rack
+WWW= https://redis-store.org/redis-rack/ \
+ https://github.com/redis-store/redis-rack
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-rack-session10>=0.2.0:www/rubygem-rack-session10 \
+ rubygem-redis-store>=1.2<2:devel/rubygem-redis-store
+
+USES= gem
+
+NO_ARCH= yes
+
+post-install:
+ ${RM} ${STAGEDIR}${PREFIX}/bin/appraisal ${STAGEDIR}${PREFIX}/bin/rake
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-redis-rack-gitlab/distinfo b/www/rubygem-redis-rack-gitlab/distinfo
new file mode 100644
index 000000000000..fc78f75e6b06
--- /dev/null
+++ b/www/rubygem-redis-rack-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1702028346
+SHA256 (rubygem/redis-rack-3.0.0.gem) = abb50b82ae10ad4d11ca2e4901bfc2b98256cdafbbd95f80c86fc9e001478380
+SIZE (rubygem/redis-rack-3.0.0.gem) = 14336
diff --git a/www/rubygem-redis-rack-gitlab/pkg-descr b/www/rubygem-redis-rack-gitlab/pkg-descr
new file mode 100644
index 000000000000..d487558f190f
--- /dev/null
+++ b/www/rubygem-redis-rack-gitlab/pkg-descr
@@ -0,0 +1 @@
+Redis Store for Rack
diff --git a/www/rubygem-responders-rails-gitlab/Makefile b/www/rubygem-responders-rails-gitlab/Makefile
new file mode 100644
index 000000000000..63db73157e24
--- /dev/null
+++ b/www/rubygem-responders-rails-gitlab/Makefile
@@ -0,0 +1,21 @@
+PORTNAME= responders
+PORTVERSION= 3.1.1
+CATEGORIES= www rubygems
+MASTER_SITES= RG
+PKGNAMESUFFIX= -rails-gitlab
+
+MAINTAINER= mfechner@FreeBSD.org
+COMMENT= Simple Ruby DSL for making HTTP requests
+WWW= https://github.com/heartcombo/responders
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS= rubygem-actionpack-gitlab>=5.2:www/rubygem-actionpack-gitlab \
+ rubygem-railties-gitlab>=5.2:www/rubygem-railties-gitlab
+
+USES= gem
+
+NO_ARCH= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-responders-rails-gitlab/distinfo b/www/rubygem-responders-rails-gitlab/distinfo
new file mode 100644
index 000000000000..6731238316f3
--- /dev/null
+++ b/www/rubygem-responders-rails-gitlab/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1714227796
+SHA256 (rubygem/responders-3.1.1.gem) = 92f2a87e09028347368639cfb468f5fefa745cb0dc2377ef060db1cdd79a341a
+SIZE (rubygem/responders-3.1.1.gem) = 20480
diff --git a/www/rubygem-responders-rails-gitlab/pkg-descr b/www/rubygem-responders-rails-gitlab/pkg-descr
new file mode 100644
index 000000000000..22f8e4f8553b
--- /dev/null
+++ b/www/rubygem-responders-rails-gitlab/pkg-descr
@@ -0,0 +1 @@
+Responders provides a set of responders modules to dry up your Rails app.
diff --git a/www/rubygem-rqrcode/Makefile b/www/rubygem-rqrcode/Makefile
index 3e8f2a9c267e..806989a88ed3 100644
--- a/www/rubygem-rqrcode/Makefile
+++ b/www/rubygem-rqrcode/Makefile
@@ -1,5 +1,5 @@
PORTNAME= rqrcode
-PORTVERSION= 3.0.0
+PORTVERSION= 3.1.0
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-rqrcode/distinfo b/www/rubygem-rqrcode/distinfo
index 83d4e4f727b7..3ce9a3258252 100644
--- a/www/rubygem-rqrcode/distinfo
+++ b/www/rubygem-rqrcode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745725534
-SHA256 (rubygem/rqrcode-3.0.0.gem) = 44890d5209a435f089875ac03050db1f391606c7fdabc5695c97dec0980840aa
-SIZE (rubygem/rqrcode-3.0.0.gem) = 105984
+TIMESTAMP = 1745936448
+SHA256 (rubygem/rqrcode-3.1.0.gem) = e2d5996375f6e9a013823c289ed575dbea678b8e0388574302c1fac563f098af
+SIZE (rubygem/rqrcode-3.1.0.gem) = 106496
diff --git a/www/rubygem-selenium-webdriver/Makefile b/www/rubygem-selenium-webdriver/Makefile
index e6158fb6d6e1..dcc0be218fa5 100644
--- a/www/rubygem-selenium-webdriver/Makefile
+++ b/www/rubygem-selenium-webdriver/Makefile
@@ -1,5 +1,5 @@
PORTNAME= selenium-webdriver
-PORTVERSION= 4.31.0
+PORTVERSION= 4.32.0
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-selenium-webdriver/distinfo b/www/rubygem-selenium-webdriver/distinfo
index ec651f49b4bb..03625d1bee16 100644
--- a/www/rubygem-selenium-webdriver/distinfo
+++ b/www/rubygem-selenium-webdriver/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744289362
-SHA256 (rubygem/selenium-webdriver-4.31.0.gem) = ddb2d88eee23cddb5d6a9dadd909427a9e5163718338e11a91eef2fbead100e9
-SIZE (rubygem/selenium-webdriver-4.31.0.gem) = 8501760
+TIMESTAMP = 1747547542
+SHA256 (rubygem/selenium-webdriver-4.32.0.gem) = 20dbdf27b586beeac9e2791a22312b414d0a30192b6ce144779f7dfde8ae8afe
+SIZE (rubygem/selenium-webdriver-4.32.0.gem) = 8502784
diff --git a/www/rubygem-thruster/Makefile b/www/rubygem-thruster/Makefile
index 5dab7f56425d..86503bd894f5 100644
--- a/www/rubygem-thruster/Makefile
+++ b/www/rubygem-thruster/Makefile
@@ -1,5 +1,5 @@
PORTNAME= thruster
-PORTVERSION= 0.1.12
+PORTVERSION= 0.1.13
CATEGORIES= www rubygems
MASTER_SITES= RG
diff --git a/www/rubygem-thruster/distinfo b/www/rubygem-thruster/distinfo
index 74b39c7f4f2b..d8e342eab743 100644
--- a/www/rubygem-thruster/distinfo
+++ b/www/rubygem-thruster/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742070770
-SHA256 (rubygem/thruster-0.1.12.gem) = a6271224fbb4bbcfb9fe6231591656724d73d0a0c774bc6f35b0a3bc88413bb2
-SIZE (rubygem/thruster-0.1.12.gem) = 7680
+TIMESTAMP = 1745936434
+SHA256 (rubygem/thruster-0.1.13.gem) = f889335a7c93b497ecf3a21beeb2cc698bdb181b1ce5cca5f0140f0e9fdcbb5b
+SIZE (rubygem/thruster-0.1.13.gem) = 7680
diff --git a/www/selenium/Makefile b/www/selenium/Makefile
index e2551097a07f..48dc76afe821 100644
--- a/www/selenium/Makefile
+++ b/www/selenium/Makefile
@@ -1,8 +1,8 @@
PORTNAME= selenium
-PORTVERSION= 4.26.0
+DISTVERSION= 4.32.0
CATEGORIES= www devel java
-MASTER_SITES= https://github.com/SeleniumHQ/${PORTNAME}/releases/download/${PORTNAME}-${PORTVERSION}/
-DISTNAME= selenium-server-${PORTVERSION}
+MASTER_SITES= https://github.com/SeleniumHQ/${PORTNAME}/releases/download/${PORTNAME}-${DISTVERSION}/
+DISTNAME= selenium-server-${DISTVERSION}
EXTRACT_SUFX= .jar
EXTRACT_ONLY=
@@ -21,7 +21,7 @@ USE_RC_SUBR= selenium
NO_ARCH= yes
NO_BUILD= yes
SUB_LIST+= JAVA_HOME=${JAVA_HOME} \
- SELENIUM_VERSION=${PORTVERSION}
+ SELENIUM_VERSION=${DISTVERSION}
SELENIUM_HOME= ${PREFIX}/selenium
diff --git a/www/selenium/distinfo b/www/selenium/distinfo
index a9ad3f875f3a..a6af3d02879f 100644
--- a/www/selenium/distinfo
+++ b/www/selenium/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731376689
-SHA256 (selenium-server-4.26.0.jar) = 19138985733452abe00339350fd74571a43d11ef8aad55a29c18d33f326ccf0a
-SIZE (selenium-server-4.26.0.jar) = 42632726
+TIMESTAMP = 1747707505
+SHA256 (selenium-server-4.32.0.jar) = a2a40741368a4251b9ba60469a048e4fae9417491171d9faf7ce55cc40320335
+SIZE (selenium-server-4.32.0.jar) = 42675799
diff --git a/www/smarty/Makefile b/www/smarty/Makefile
index 2bfc20c17f5f..d1517dc23193 100644
--- a/www/smarty/Makefile
+++ b/www/smarty/Makefile
@@ -1,5 +1,5 @@
PORTNAME= smarty
-PORTVERSION= 5.4.5
+PORTVERSION= 5.5.0
DISTVERSIONPREFIX= v
CATEGORIES= www
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
diff --git a/www/smarty/distinfo b/www/smarty/distinfo
index 34a099960851..87c0ea940128 100644
--- a/www/smarty/distinfo
+++ b/www/smarty/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745177922
-SHA256 (smarty-php-smarty-v5.4.5_GH0.tar.gz) = c186e7654f04e39451998cd4e8df463eb34d19466e33bc6e39b7b7454ec50172
-SIZE (smarty-php-smarty-v5.4.5_GH0.tar.gz) = 332677
+TIMESTAMP = 1747546448
+SHA256 (smarty-php-smarty-v5.5.0_GH0.tar.gz) = 8d037a0aceb2bbc46acf3145237a3d3a42cf0b24125eb264e6d0650c8b5b1fb8
+SIZE (smarty-php-smarty-v5.5.0_GH0.tar.gz) = 332736
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index 44fbd991ff76..5370d98555c3 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -1,5 +1,5 @@
PORTNAME= sogo
-PORTVERSION= 5.12.0
+PORTVERSION= 5.12.1
CATEGORIES= www gnustep
MASTER_SITES= https://packages.sogo.nu/sources/
DISTNAME= SOGo-${PORTVERSION}
diff --git a/www/sogo/distinfo b/www/sogo/distinfo
index 230d2fe0b8cd..678df0747647 100644
--- a/www/sogo/distinfo
+++ b/www/sogo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742970033
-SHA256 (SOGo-5.12.0.tar.gz) = f5c17371ad6e6442b3fc8e1c3149710033d5c61aa3f2a7a3f090b7f51cbec83a
-SIZE (SOGo-5.12.0.tar.gz) = 37238251
+TIMESTAMP = 1747459352
+SHA256 (SOGo-5.12.1.tar.gz) = b51d39b31af9a6059db79a18201f3c6cfd584468e369eebe286f8181804bcd99
+SIZE (SOGo-5.12.1.tar.gz) = 37738293
diff --git a/www/sogo/files/patch-SoObjects_SOGo_SOGoMailer.m b/www/sogo/files/patch-SoObjects_SOGo_SOGoMailer.m
deleted file mode 100644
index f204575eb042..000000000000
--- a/www/sogo/files/patch-SoObjects_SOGo_SOGoMailer.m
+++ /dev/null
@@ -1,11 +0,0 @@
---- SoObjects/SOGo/SOGoMailer.m 2025-03-25 23:34:20.921308000 -0700
-+++ SoObjects/SOGo/SOGoMailer.m 2025-03-25 23:34:50.890963000 -0700
-@@ -325,7 +325,7 @@
- {
- login = [currentAcount objectForKey: @"userName"];
- password = [currentAcount objectForKey: @"password"];
-- smtpAuthMethod = "plain"; //Only support plain for auxiliary account
-+ smtpAuthMethod = @"plain"; //Only support plain for auxiliary account
- }
- else
- {
diff --git a/www/sogo/pkg-plist b/www/sogo/pkg-plist
index 042b1934d44c..e3f23632b021 100644
--- a/www/sogo/pkg-plist
+++ b/www/sogo/pkg-plist
@@ -751,7 +751,7 @@ GNUstep/Local/Library/Libraries/sogo/libSOGo.so.5
GNUstep/Local/Library/Libraries/sogo/libSOGo.so.%%VERSION%%
GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so
GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.12
-GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.%%VERSION%%
+GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.12.0
GNUstep/Local/Library/OCSTypeModels/appointment-oracle.ocs
GNUstep/Local/Library/OCSTypeModels/appointment.ocs
GNUstep/Local/Library/OCSTypeModels/contact-oracle.ocs
@@ -2092,6 +2092,13 @@ GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-file-upload.js
GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-file-upload.js.map
GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-file-upload.min.js
GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-file-upload.min.js.map
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/angular-material-mocks.js
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/angular-material.js
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/angular-material.min.js
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/angular-material.scss
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/layouts/angular-material.layout-attributes.scss
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/layouts/angular-material.layouts.scss
+GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material-dist/package.json
GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material.js
GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-material.min.js
GNUstep/Local/Library/SOGo/WebServerResources/js/vendor/angular-messages.js
diff --git a/www/tgpt/Makefile b/www/tgpt/Makefile
index 4749144e494b..9175cf471dbf 100644
--- a/www/tgpt/Makefile
+++ b/www/tgpt/Makefile
@@ -1,6 +1,6 @@
PORTNAME= tgpt
DISTVERSIONPREFIX= v
-DISTVERSION= 2.9.6
+DISTVERSION= 2.10.0
CATEGORIES= www
MAINTAINER= nxjoseph@protonmail.com
diff --git a/www/tgpt/distinfo b/www/tgpt/distinfo
index cac758f61d05..0255b89dceb5 100644
--- a/www/tgpt/distinfo
+++ b/www/tgpt/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1745509556
-SHA256 (go/www_tgpt/tgpt-v2.9.6/v2.9.6.mod) = 419084ed0cd4a827ad2ca8fecaabeaf17abaaa104cbef9faead421f1b1804cc0
-SIZE (go/www_tgpt/tgpt-v2.9.6/v2.9.6.mod) = 2573
-SHA256 (go/www_tgpt/tgpt-v2.9.6/v2.9.6.zip) = b15b6b3a7d67c5929aec0102d08d0159acc91208d1ce606dc5aadde46708226e
-SIZE (go/www_tgpt/tgpt-v2.9.6/v2.9.6.zip) = 67221
+TIMESTAMP = 1746991884
+SHA256 (go/www_tgpt/tgpt-v2.10.0/v2.10.0.mod) = 419084ed0cd4a827ad2ca8fecaabeaf17abaaa104cbef9faead421f1b1804cc0
+SIZE (go/www_tgpt/tgpt-v2.10.0/v2.10.0.mod) = 2573
+SHA256 (go/www_tgpt/tgpt-v2.10.0/v2.10.0.zip) = fa43944dddb5f161eb2ab2847ea1e83dcd8caef883ab65b163dc02223cb7156a
+SIZE (go/www_tgpt/tgpt-v2.10.0/v2.10.0.zip) = 68962
diff --git a/www/tomcat-devel/Makefile b/www/tomcat-devel/Makefile
index d643c6982b9d..56a5046ab6cb 100644
--- a/www/tomcat-devel/Makefile
+++ b/www/tomcat-devel/Makefile
@@ -1,6 +1,5 @@
PORTNAME= tomcat
-DISTVERSION= 11.0.6
-PORTREVISION= 2
+DISTVERSION= 11.0.7
CATEGORIES= www java
MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
PKGNAMESUFFIX= -devel
diff --git a/www/tomcat-devel/distinfo b/www/tomcat-devel/distinfo
index e344328ff6a6..805285ec7f65 100644
--- a/www/tomcat-devel/distinfo
+++ b/www/tomcat-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744195573
-SHA256 (apache-tomcat-11.0.6.tar.gz) = 864458f646bf938d3feb5773456199819b91d52670e4d724b9866ccfd4761cef
-SIZE (apache-tomcat-11.0.6.tar.gz) = 13878198
+TIMESTAMP = 1747453588
+SHA256 (apache-tomcat-11.0.7.tar.gz) = 2fcece641c62ba1f28e1d7b257493151fc44f161fb391015ee6a95fa71632fb9
+SIZE (apache-tomcat-11.0.7.tar.gz) = 14091809
diff --git a/www/tomcat-devel/pkg-plist b/www/tomcat-devel/pkg-plist
index 28bd1cee81f1..ee68e1b0d4fd 100644
--- a/www/tomcat-devel/pkg-plist
+++ b/www/tomcat-devel/pkg-plist
@@ -103,8 +103,14 @@
%%DOCS%%%%T%%/webapps/docs/architecture/index.html
%%DOCS%%%%T%%/webapps/docs/architecture/overview.html
%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.png
%%DOCS%%%%T%%/webapps/docs/architecture/startup.html
%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.plantuml
%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.png
diff --git a/www/tomcat101/Makefile b/www/tomcat101/Makefile
index 755b7bd76299..6977459192aa 100644
--- a/www/tomcat101/Makefile
+++ b/www/tomcat101/Makefile
@@ -1,6 +1,5 @@
PORTNAME= tomcat
-DISTVERSION= 10.1.40
-PORTREVISION= 2
+DISTVERSION= 10.1.41
CATEGORIES= www java
MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
PKGNAMESUFFIX= 101
diff --git a/www/tomcat101/distinfo b/www/tomcat101/distinfo
index d2c548eb367e..cb885000965a 100644
--- a/www/tomcat101/distinfo
+++ b/www/tomcat101/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744198379
-SHA256 (apache-tomcat-10.1.40.tar.gz) = 25f1e607f17ee2fa99e329eec23b6393ab9e1390929c6cdcb31f749576b94d8e
-SIZE (apache-tomcat-10.1.40.tar.gz) = 13867286
+TIMESTAMP = 1747074614
+SHA256 (apache-tomcat-10.1.41.tar.gz) = 1f7cc8cce2d5f4acd35491d0fa2abafa6ddd9bb0425b57b277310fde5ff2fcb3
+SIZE (apache-tomcat-10.1.41.tar.gz) = 14079449
diff --git a/www/tomcat101/pkg-plist b/www/tomcat101/pkg-plist
index dac61a4c57df..1fae71f972e4 100644
--- a/www/tomcat101/pkg-plist
+++ b/www/tomcat101/pkg-plist
@@ -105,8 +105,14 @@
%%DOCS%%%%T%%/webapps/docs/architecture/index.html
%%DOCS%%%%T%%/webapps/docs/architecture/overview.html
%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.png
%%DOCS%%%%T%%/webapps/docs/architecture/startup.html
%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.plantuml
%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.png
diff --git a/www/tomcat110/Makefile b/www/tomcat110/Makefile
index a35009afb7e2..6c8fa8250802 100644
--- a/www/tomcat110/Makefile
+++ b/www/tomcat110/Makefile
@@ -1,6 +1,5 @@
PORTNAME= tomcat
-DISTVERSION= 11.0.6
-PORTREVISION= 2
+DISTVERSION= 11.0.7
CATEGORIES= www java
MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9]+)(.*)/\1/}/v${DISTVERSION}/bin
PKGNAMESUFFIX= 110
diff --git a/www/tomcat110/distinfo b/www/tomcat110/distinfo
index e344328ff6a6..805285ec7f65 100644
--- a/www/tomcat110/distinfo
+++ b/www/tomcat110/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744195573
-SHA256 (apache-tomcat-11.0.6.tar.gz) = 864458f646bf938d3feb5773456199819b91d52670e4d724b9866ccfd4761cef
-SIZE (apache-tomcat-11.0.6.tar.gz) = 13878198
+TIMESTAMP = 1747453588
+SHA256 (apache-tomcat-11.0.7.tar.gz) = 2fcece641c62ba1f28e1d7b257493151fc44f161fb391015ee6a95fa71632fb9
+SIZE (apache-tomcat-11.0.7.tar.gz) = 14091809
diff --git a/www/tomcat110/pkg-plist b/www/tomcat110/pkg-plist
index 28bd1cee81f1..ee68e1b0d4fd 100644
--- a/www/tomcat110/pkg-plist
+++ b/www/tomcat110/pkg-plist
@@ -103,8 +103,14 @@
%%DOCS%%%%T%%/webapps/docs/architecture/index.html
%%DOCS%%%%T%%/webapps/docs/architecture/overview.html
%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.png
%%DOCS%%%%T%%/webapps/docs/architecture/startup.html
%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.plantuml
%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.png
diff --git a/www/tomcat9/Makefile b/www/tomcat9/Makefile
index 6f5598aa5350..65d7eaf04b34 100644
--- a/www/tomcat9/Makefile
+++ b/www/tomcat9/Makefile
@@ -1,6 +1,5 @@
PORTNAME= tomcat
-DISTVERSION= 9.0.104
-PORTREVISION= 2
+DISTVERSION= 9.0.105
CATEGORIES= www java
MASTER_SITES= APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION:C/([0-9])(.*)/\1/}/v${DISTVERSION}/bin
PKGNAMESUFFIX= 9
diff --git a/www/tomcat9/distinfo b/www/tomcat9/distinfo
index 1b72aade617d..f5302f645647 100644
--- a/www/tomcat9/distinfo
+++ b/www/tomcat9/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744234542
-SHA256 (apache-tomcat-9.0.104.tar.gz) = fa19751c8f81b294dde346ad93517bded84f40885c442e0a7130da982a22abae
-SIZE (apache-tomcat-9.0.104.tar.gz) = 12787166
+TIMESTAMP = 1747087680
+SHA256 (apache-tomcat-9.0.105.tar.gz) = ee86ee179493e610358b23a0f79ba70b9e76ade71157aada9ac7cdcdcdbe35f5
+SIZE (apache-tomcat-9.0.105.tar.gz) = 13000541
diff --git a/www/tomcat9/pkg-plist b/www/tomcat9/pkg-plist
index 0034fa871ac8..7a480526a68d 100644
--- a/www/tomcat9/pkg-plist
+++ b/www/tomcat9/pkg-plist
@@ -102,8 +102,14 @@
%%DOCS%%%%T%%/webapps/docs/architecture/index.html
%%DOCS%%%%T%%/webapps/docs/architecture/overview.html
%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess.html
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/authentication-process.png
-%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/request-process.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/11_nio.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/21_http11.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/31_synchronous.png
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.plantuml
+%%DOCS%%%%T%%/webapps/docs/architecture/requestProcess/41_basic.png
%%DOCS%%%%T%%/webapps/docs/architecture/startup.html
%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.plantuml
%%DOCS%%%%T%%/webapps/docs/architecture/startup/1_overview.png
diff --git a/www/tor-browser/Makefile b/www/tor-browser/Makefile
index ffc9bec81862..ed510b698151 100644
--- a/www/tor-browser/Makefile
+++ b/www/tor-browser/Makefile
@@ -1,8 +1,8 @@
PORTNAME= tor-browser
-DISTVERSION= 14.5.1
+DISTVERSION= 14.5.2
CATEGORIES= www net security wayland
-TAG_BASE= 86442427facf038d5706644221de7e2fb733550b
-TAG_TOR= 2c0b448503d52c3b512d1e7a55ccc78ac19db146
+TAG_BASE= b54e21b36db35ad390c4f385b76cbd293a58cbc6
+TAG_TOR= 94aae5dcdfa2e99b516acb6a834a54f7de76e54f
MASTER_SITES= TOR \
LOCAL/vvd \
https://build-sources.tbb.torproject.org/:source1 \
@@ -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.10.0esr-14.5-1-build2
+DISTNAME= src-firefox-tor-browser-128.10.1esr-14.5-1-build1
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 26de690fd319..ba1810215ff8 100644
--- a/www/tor-browser/distinfo
+++ b/www/tor-browser/distinfo
@@ -1,15 +1,15 @@
-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
+TIMESTAMP = 1747646474
+SHA256 (src-firefox-tor-browser-128.10.1esr-14.5-1-build1.tar.xz) = 221056bed25507e84d74bf679580b66762f718506b98e4f0b2ca3687cd46b11f
+SIZE (src-firefox-tor-browser-128.10.1esr-14.5-1-build1.tar.xz) = 611165768
SHA256 (manual_215922.zip) = b5ed703f54d52e9f197320f3698e936d585a3fed23cc4f9fbf59edce2869f885
SIZE (manual_215922.zip) = 28305786
SHA256 (fonts-3--4348e1.tar.zst) = 7fbbecece6de777f196982f6eb567970a6d8e7ac2bf5b1ad6b90e1ea36374032
SIZE (fonts-3--4348e1.tar.zst) = 27441580
SHA256 (noscript-12.1.1.xpi) = f9639e63ffcfc352036de00e4ff6694bb0ca65a0bb8fbd103bd08f32dc1ff31a
SIZE (noscript-12.1.1.xpi) = 980626
-SHA256 (tpo-translation-86442427facf038d5706644221de7e2fb733550b_GL0.tar.gz) = fab408bc623e10d0baf4ee06f9358a24d6dce2b6456de140ff6a03aa5d20b26c
-SIZE (tpo-translation-86442427facf038d5706644221de7e2fb733550b_GL0.tar.gz) = 792784
-SHA256 (tpo-translation-2c0b448503d52c3b512d1e7a55ccc78ac19db146_GL0.tar.gz) = 8425aff4bfe75af487ac764adc0e351d7e8d51cecdf7edcb10fa318c8fd6f549
-SIZE (tpo-translation-2c0b448503d52c3b512d1e7a55ccc78ac19db146_GL0.tar.gz) = 2832022
+SHA256 (tpo-translation-b54e21b36db35ad390c4f385b76cbd293a58cbc6_GL0.tar.gz) = 3548ab34d48c8d4a6eaf74130fb3ae4040acb3fcea6d3463ff95669b839e3112
+SIZE (tpo-translation-b54e21b36db35ad390c4f385b76cbd293a58cbc6_GL0.tar.gz) = 792132
+SHA256 (tpo-translation-94aae5dcdfa2e99b516acb6a834a54f7de76e54f_GL0.tar.gz) = 0962ba706da369264b659308f64824d0a7ba87a8438f539bff9ca922e2f0d9ff
+SIZE (tpo-translation-94aae5dcdfa2e99b516acb6a834a54f7de76e54f_GL0.tar.gz) = 2831434
SHA256 (mozilla-l10n-firefox-l10n-fcd0300e8478d1ec4d1c097a073ddb8e1e0351e3_GH0.tar.gz) = d07ecc7fe021998b523357849f71d52c9cb5248cb79bba29793e1ba353bae5bb
SIZE (mozilla-l10n-firefox-l10n-fcd0300e8478d1ec4d1c097a073ddb8e1e0351e3_GH0.tar.gz) = 68409826
diff --git a/www/trunk/Makefile b/www/trunk/Makefile
index b7f6851722de..0217c8298735 100644
--- a/www/trunk/Makefile
+++ b/www/trunk/Makefile
@@ -1,7 +1,6 @@
PORTNAME= trunk
DISTVERSIONPREFIX= v
-DISTVERSION= 0.21.12
-PORTREVISION= 1
+DISTVERSION= 0.21.14
CATEGORIES= www devel
MAINTAINER= yuri@FreeBSD.org
@@ -44,10 +43,10 @@ CARGO_CRATES= addr2line-0.24.2 \
async-trait-0.1.88 \
atomic-waker-1.1.2 \
autocfg-1.4.0 \
- aws-lc-rs-1.12.6 \
- aws-lc-sys-0.27.1 \
- axum-0.8.1 \
- axum-core-0.5.0 \
+ aws-lc-rs-1.13.0 \
+ aws-lc-sys-0.28.0 \
+ axum-0.8.3 \
+ axum-core-0.5.2 \
axum-server-0.7.2 \
backtrace-0.3.74 \
base64-0.22.1 \
@@ -69,15 +68,15 @@ CARGO_CRATES= addr2line-0.24.2 \
cargo-lock-10.1.0 \
cargo-platform-0.1.9 \
cargo_metadata-0.19.2 \
- cc-1.2.17 \
+ cc-1.2.18 \
cexpr-0.6.0 \
cfg-if-1.0.0 \
cfg_aliases-0.2.1 \
chrono-0.4.40 \
cipher-0.4.4 \
clang-sys-1.8.1 \
- clap-4.5.34 \
- clap_builder-4.5.34 \
+ clap-4.5.35 \
+ clap_builder-4.5.35 \
clap_derive-4.5.32 \
clap_lex-0.7.4 \
cmake-0.1.54 \
@@ -111,7 +110,7 @@ CARGO_CRATES= addr2line-0.24.2 \
data-encoding-2.8.0 \
data-url-0.1.1 \
deflate64-0.1.9 \
- deranged-0.4.1 \
+ deranged-0.4.0 \
derive_arbitrary-1.4.1 \
derive_more-0.99.19 \
digest-0.10.7 \
@@ -128,13 +127,13 @@ 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.7 \
+ env_logger-0.11.8 \
equivalent-1.0.2 \
- errno-0.3.10 \
+ errno-0.3.11 \
fastrand-2.3.0 \
file-id-0.2.2 \
filetime-0.2.25 \
- flate2-1.1.0 \
+ flate2-1.1.1 \
fnv-1.0.7 \
foreign-types-0.3.2 \
foreign-types-shared-0.1.1 \
@@ -186,7 +185,7 @@ CARGO_CRATES= addr2line-0.24.2 \
hyper-1.6.0 \
hyper-rustls-0.27.5 \
hyper-tls-0.6.0 \
- hyper-util-0.1.10 \
+ hyper-util-0.1.11 \
icu_collections-1.5.0 \
icu_locid-1.5.0 \
icu_locid_transform-1.5.0 \
@@ -199,7 +198,7 @@ CARGO_CRATES= addr2line-0.24.2 \
icu_provider_macros-1.5.0 \
idna-1.0.3 \
idna_adapter-1.2.0 \
- indexmap-2.8.0 \
+ indexmap-2.9.0 \
inotify-0.11.0 \
inotify-sys-0.1.5 \
inout-0.1.4 \
@@ -212,7 +211,7 @@ CARGO_CRATES= addr2line-0.24.2 \
itertools-0.12.1 \
itoa-0.4.8 \
itoa-1.0.15 \
- jobserver-0.1.32 \
+ jobserver-0.1.33 \
js-sys-0.3.77 \
kqueue-1.0.8 \
kqueue-sys-1.0.4 \
@@ -246,7 +245,7 @@ CARGO_CRATES= addr2line-0.24.2 \
minify-html-common-0.0.2 \
minify-js-0.5.6 \
minimal-lexical-0.2.1 \
- miniz_oxide-0.8.5 \
+ miniz_oxide-0.8.7 \
mio-1.0.3 \
moka-0.12.10 \
native-tls-0.2.14 \
@@ -263,13 +262,13 @@ CARGO_CRATES= addr2line-0.24.2 \
num-conv-0.1.0 \
num-traits-0.2.19 \
object-0.36.7 \
- once_cell-1.21.1 \
+ once_cell-1.21.3 \
open-5.3.2 \
- openssl-0.10.71 \
+ openssl-0.10.72 \
openssl-macros-0.1.1 \
openssl-probe-0.1.6 \
openssl-src-300.4.2+3.4.1 \
- openssl-sys-0.9.106 \
+ openssl-sys-0.9.107 \
option-ext-0.2.0 \
outref-0.1.0 \
overload-0.1.1 \
@@ -300,7 +299,7 @@ CARGO_CRATES= addr2line-0.24.2 \
powerfmt-0.2.0 \
ppv-lite86-0.2.21 \
precomputed-hash-0.1.1 \
- prettyplease-0.2.31 \
+ prettyplease-0.2.32 \
proc-macro-crate-3.3.0 \
proc-macro-hack-0.5.20+deprecated \
proc-macro2-1.0.94 \
@@ -324,7 +323,7 @@ CARGO_CRATES= addr2line-0.24.2 \
rand_pcg-0.2.1 \
rayon-1.10.0 \
rayon-core-1.12.1 \
- redox_syscall-0.5.10 \
+ redox_syscall-0.5.11 \
redox_users-0.5.0 \
regex-1.11.1 \
regex-automata-0.1.10 \
@@ -347,7 +346,7 @@ CARGO_CRATES= addr2line-0.24.2 \
rustc-hash-2.1.1 \
rustc_version-0.4.1 \
rustix-0.38.44 \
- rustix-1.0.3 \
+ rustix-1.0.5 \
rustls-0.23.25 \
rustls-native-certs-0.8.1 \
rustls-pemfile-2.2.0 \
@@ -387,8 +386,8 @@ CARGO_CRATES= addr2line-0.24.2 \
siphasher-0.3.11 \
siphasher-1.0.1 \
slab-0.4.9 \
- smallvec-1.14.0 \
- socket2-0.5.8 \
+ smallvec-1.15.0 \
+ socket2-0.5.9 \
stable_deref_trait-1.2.0 \
strsim-0.11.1 \
strum-0.27.1 \
@@ -415,7 +414,7 @@ CARGO_CRATES= addr2line-0.24.2 \
tinystr-0.7.6 \
tinyvec-1.9.0 \
tinyvec_macros-0.1.1 \
- tokio-1.44.1 \
+ tokio-1.44.2 \
tokio-macros-2.5.0 \
tokio-native-tls-0.3.1 \
tokio-openssl-0.6.5 \
@@ -543,7 +542,7 @@ CARGO_CRATES= addr2line-0.24.2 \
zeroize_derive-1.4.2 \
zerovec-0.10.4 \
zerovec-derive-0.10.3 \
- zip-2.5.0 \
+ zip-2.6.1 \
zopfli-0.8.1 \
zstd-0.13.3 \
zstd-safe-7.2.4 \
diff --git a/www/trunk/distinfo b/www/trunk/distinfo
index 9abb728419e2..0deabb67be2d 100644
--- a/www/trunk/distinfo
+++ b/www/trunk/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1743143886
+TIMESTAMP = 1746804832
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
@@ -41,14 +41,14 @@ 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/aws-lc-rs-1.12.6.crate) = dabb68eb3a7aa08b46fddfd59a3d55c978243557a90ab804769f7e20e67d2b01
-SIZE (rust/crates/aws-lc-rs-1.12.6.crate) = 199625
-SHA256 (rust/crates/aws-lc-sys-0.27.1.crate) = 77926887776171ced7d662120a75998e444d3750c951abfe07f90da130514b1f
-SIZE (rust/crates/aws-lc-sys-0.27.1.crate) = 8495439
-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/aws-lc-rs-1.13.0.crate) = 19b756939cb2f8dc900aa6dcd505e6e2428e9cae7ff7b028c49e3946efa70878
+SIZE (rust/crates/aws-lc-rs-1.13.0.crate) = 202653
+SHA256 (rust/crates/aws-lc-sys-0.28.0.crate) = b9f7720b74ed28ca77f90769a71fd8c637a0137f6fae4ae947e1050229cff57f
+SIZE (rust/crates/aws-lc-sys-0.28.0.crate) = 8517214
+SHA256 (rust/crates/axum-0.8.3.crate) = de45108900e1f9b9242f7f2e254aa3e2c029c921c258fe9e6b4217eeebd54288
+SIZE (rust/crates/axum-0.8.3.crate) = 173592
+SHA256 (rust/crates/axum-core-0.5.2.crate) = 68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6
+SIZE (rust/crates/axum-core-0.5.2.crate) = 26212
SHA256 (rust/crates/axum-server-0.7.2.crate) = 495c05f60d6df0093e8fb6e74aa5846a0ad06abaf96d76166283720bf740f8ab
SIZE (rust/crates/axum-server-0.7.2.crate) = 42158
SHA256 (rust/crates/backtrace-0.3.74.crate) = 8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a
@@ -91,8 +91,8 @@ SHA256 (rust/crates/cargo-platform-0.1.9.crate) = e35af189006b9c0f00a064685c7270
SIZE (rust/crates/cargo-platform-0.1.9.crate) = 12010
SHA256 (rust/crates/cargo_metadata-0.19.2.crate) = dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba
SIZE (rust/crates/cargo_metadata-0.19.2.crate) = 28370
-SHA256 (rust/crates/cc-1.2.17.crate) = 1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a
-SIZE (rust/crates/cc-1.2.17.crate) = 105794
+SHA256 (rust/crates/cc-1.2.18.crate) = 525046617d8376e3db1deffb079e91cef90a89fc3ca5c185bbf8c9ecdd15cd5c
+SIZE (rust/crates/cc-1.2.18.crate) = 105851
SHA256 (rust/crates/cexpr-0.6.0.crate) = 6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766
SIZE (rust/crates/cexpr-0.6.0.crate) = 17966
SHA256 (rust/crates/cfg-if-1.0.0.crate) = baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd
@@ -105,10 +105,10 @@ SHA256 (rust/crates/cipher-0.4.4.crate) = 773f3b9af64447d2ce9850330c473515014aa2
SIZE (rust/crates/cipher-0.4.4.crate) = 19073
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.34.crate) = e958897981290da2a852763fe9cdb89cd36977a5d729023127095fa94d95e2ff
-SIZE (rust/crates/clap-4.5.34.crate) = 56980
-SHA256 (rust/crates/clap_builder-4.5.34.crate) = 83b0f35019843db2160b5bb19ae09b4e6411ac33fc6a712003c33e03090e2489
-SIZE (rust/crates/clap_builder-4.5.34.crate) = 168417
+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_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
@@ -175,8 +175,8 @@ SHA256 (rust/crates/data-url-0.1.1.crate) = 3a30bfce702bcfa94e906ef82421f2c0e61c
SIZE (rust/crates/data-url-0.1.1.crate) = 20039
SHA256 (rust/crates/deflate64-0.1.9.crate) = da692b8d1080ea3045efaab14434d40468c3d8657e42abddfffca87b428f4c1b
SIZE (rust/crates/deflate64-0.1.9.crate) = 15104
-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_arbitrary-1.4.1.crate) = 30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800
SIZE (rust/crates/derive_arbitrary-1.4.1.crate) = 11521
SHA256 (rust/crates/derive_more-0.99.19.crate) = 3da29a38df43d6f156149c9b43ded5e018ddff2a855cf2cfd62e8cd7d079c69f
@@ -209,20 +209,20 @@ 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.7.crate) = c3716d7a920fb4fac5d84e9d4bce8ceb321e9414b4409da61b07b75c1e3d0697
-SIZE (rust/crates/env_logger-0.11.7.crate) = 31842
+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.10.crate) = 33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d
-SIZE (rust/crates/errno-0.3.10.crate) = 11824
+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/file-id-0.2.2.crate) = 6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36
SIZE (rust/crates/file-id-0.2.2.crate) = 9531
SHA256 (rust/crates/filetime-0.2.25.crate) = 35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586
SIZE (rust/crates/filetime-0.2.25.crate) = 14940
-SHA256 (rust/crates/flate2-1.1.0.crate) = 11faaf5a5236997af9848be0bef4db95824b1d534ebc64d0f0c6cf3e67bd38dc
-SIZE (rust/crates/flate2-1.1.0.crate) = 110650
+SHA256 (rust/crates/flate2-1.1.1.crate) = 7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece
+SIZE (rust/crates/flate2-1.1.1.crate) = 77224
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
@@ -325,8 +325,8 @@ SHA256 (rust/crates/hyper-rustls-0.27.5.crate) = 2d191583f3da1305256f22463b9bb04
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/hyper-util-0.1.11.crate) = 497bbc33a26fdd4af9ed9c70d63f61cf56a938375fbb32df34db9b1cd6d643f2
+SIZE (rust/crates/hyper-util-0.1.11.crate) = 75973
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
@@ -351,8 +351,8 @@ 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.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/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
@@ -377,8 +377,8 @@ SHA256 (rust/crates/itoa-0.4.8.crate) = b71991ff56294aa922b450139ee08b3bfc70982c
SIZE (rust/crates/itoa-0.4.8.crate) = 11926
SHA256 (rust/crates/itoa-1.0.15.crate) = 4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c
SIZE (rust/crates/itoa-1.0.15.crate) = 11231
-SHA256 (rust/crates/jobserver-0.1.32.crate) = 48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0
-SIZE (rust/crates/jobserver-0.1.32.crate) = 27549
+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/kqueue-1.0.8.crate) = 7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c
@@ -445,8 +445,8 @@ SHA256 (rust/crates/minify-js-0.5.6.crate) = 22d6c512a82abddbbc13b70609cb2beff01
SIZE (rust/crates/minify-js-0.5.6.crate) = 23660
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.5.crate) = 8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5
-SIZE (rust/crates/miniz_oxide-0.8.5.crate) = 62237
+SHA256 (rust/crates/miniz_oxide-0.8.7.crate) = ff70ce3e48ae43fa075863cef62e8b43b71a4f2382229920e0df362592919430
+SIZE (rust/crates/miniz_oxide-0.8.7.crate) = 66905
SHA256 (rust/crates/mio-1.0.3.crate) = 2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd
SIZE (rust/crates/mio-1.0.3.crate) = 103703
SHA256 (rust/crates/moka-0.12.10.crate) = a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926
@@ -479,20 +479,20 @@ 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.21.1.crate) = d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc
-SIZE (rust/crates/once_cell-1.21.1.crate) = 34256
+SHA256 (rust/crates/once_cell-1.21.3.crate) = 42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d
+SIZE (rust/crates/once_cell-1.21.3.crate) = 34534
SHA256 (rust/crates/open-5.3.2.crate) = e2483562e62ea94312f3576a7aca397306df7990b8d89033e18766744377ef95
SIZE (rust/crates/open-5.3.2.crate) = 26342
-SHA256 (rust/crates/openssl-0.10.71.crate) = 5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd
-SIZE (rust/crates/openssl-0.10.71.crate) = 281165
+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.6.crate) = d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e
SIZE (rust/crates/openssl-probe-0.1.6.crate) = 8128
SHA256 (rust/crates/openssl-src-300.4.2+3.4.1.crate) = 168ce4e058f975fe43e89d9ccf78ca668601887ae736090aacc23ae353c298e2
SIZE (rust/crates/openssl-src-300.4.2+3.4.1.crate) = 9956732
-SHA256 (rust/crates/openssl-sys-0.9.106.crate) = 8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd
-SIZE (rust/crates/openssl-sys-0.9.106.crate) = 76230
+SHA256 (rust/crates/openssl-sys-0.9.107.crate) = 8288979acd84749c744a9014b4382d42b8f7b2592847b5afb2ed29e5d16ede07
+SIZE (rust/crates/openssl-sys-0.9.107.crate) = 78156
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
@@ -553,8 +553,8 @@ SHA256 (rust/crates/ppv-lite86-0.2.21.crate) = 85eae3c4ed2f50dcfe72643da4befc30d
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/prettyplease-0.2.31.crate) = 5316f57387668042f561aae71480de936257848f9c43ce528e311d89a07cadeb
-SIZE (rust/crates/prettyplease-0.2.31.crate) = 72021
+SHA256 (rust/crates/prettyplease-0.2.32.crate) = 664ec5419c51e34154eec046ebcba56312d5a2fc3b09a06da188e1ad21afadf6
+SIZE (rust/crates/prettyplease-0.2.32.crate) = 72024
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
@@ -601,8 +601,8 @@ 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.5.10.crate) = 0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1
-SIZE (rust/crates/redox_syscall-0.5.10.crate) = 30226
+SHA256 (rust/crates/redox_syscall-0.5.11.crate) = d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3
+SIZE (rust/crates/redox_syscall-0.5.11.crate) = 30300
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
@@ -647,8 +647,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.3.crate) = e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96
-SIZE (rust/crates/rustix-1.0.3.crate) = 413960
+SHA256 (rust/crates/rustix-1.0.5.crate) = d97817398dd4bb2e6da002002db259209759911da105da92bec29ccb12cf58bf
+SIZE (rust/crates/rustix-1.0.5.crate) = 414160
SHA256 (rust/crates/rustls-0.23.25.crate) = 822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c
SIZE (rust/crates/rustls-0.23.25.crate) = 346742
SHA256 (rust/crates/rustls-native-certs-0.8.1.crate) = 7fcff2dd52b58a8d98a70243663a0d234c4e2b79235637849d15913394a247d3
@@ -727,10 +727,10 @@ SHA256 (rust/crates/siphasher-1.0.1.crate) = 56199f7ddabf13fe5074ce809e7d3f42b42
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/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/strsim-0.11.1.crate) = 7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f
@@ -783,8 +783,8 @@ 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-native-tls-0.3.1.crate) = bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2
@@ -1039,8 +1039,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 (rust/crates/zip-2.5.0.crate) = 27c03817464f64e23f6f37574b4fdc8cf65925b5bfd2b0f2aedf959791941f88
-SIZE (rust/crates/zip-2.5.0.crate) = 111877
+SHA256 (rust/crates/zip-2.6.1.crate) = 1dcb24d0152526ae49b9b96c1dcf71850ca1e0b882e4e28ed898a93c41334744
+SIZE (rust/crates/zip-2.6.1.crate) = 112133
SHA256 (rust/crates/zopfli-0.8.1.crate) = e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946
SIZE (rust/crates/zopfli-0.8.1.crate) = 50972
SHA256 (rust/crates/zstd-0.13.3.crate) = e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a
@@ -1049,5 +1049,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 (thedodd-trunk-v0.21.12_GH0.tar.gz) = 8b4f6be421c9aec08b327e79e50fad8015dc6f56fc0c856d9320bdf97df0bc05
-SIZE (thedodd-trunk-v0.21.12_GH0.tar.gz) = 561719
+SHA256 (thedodd-trunk-v0.21.14_GH0.tar.gz) = 8687bcf96bdc4decee88458745bbb760ad31dfd109e955cf455c2b64caeeae2f
+SIZE (thedodd-trunk-v0.21.14_GH0.tar.gz) = 561830
diff --git a/www/tt-rss/Makefile b/www/tt-rss/Makefile
index b6c91f2ef6f8..90f2e16e73ce 100644
--- a/www/tt-rss/Makefile
+++ b/www/tt-rss/Makefile
@@ -1,5 +1,5 @@
PORTNAME= tt-rss
-DISTVERSION= g20250220
+DISTVERSION= g20250427
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= LOCAL/meta
@@ -17,11 +17,11 @@ USES= gettext-tools php:cli,web,flavors shebangfix
USE_GITLAB= yes
GL_SITE= https://gitlab.tt-rss.org
-GL_TAGNAME= bfdfea88b988778db59fb112bbd07a4cd2aefd69
+GL_TAGNAME= f097c5ed97671f66be71e52c13917c23528ba308
# phe json/openssl extension is required but it's statically linked in default php
USE_PHP= ctype dom exif fileinfo filter iconv intl mbstring pcntl pdo \
- phar posix session simplexml sockets tokenizer xml xmlwriter \
- zip
+ phar posix session simplexml sockets sodium tokenizer xml \
+ xmlwriter zip
USE_RC_SUBR= ttrssd
SHEBANG_FILES= update.php update_daemon2.php
diff --git a/www/tt-rss/distinfo b/www/tt-rss/distinfo
index 8f80c6abb1dc..41aa613d9a2b 100644
--- a/www/tt-rss/distinfo
+++ b/www/tt-rss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740342260
-SHA256 (tt-rss-tt-rss-bfdfea88b988778db59fb112bbd07a4cd2aefd69_GL0.tar.gz) = 7424ea2d810ad6d9dd499adcd62e7358f24cda951b493090ee2b05a2bd63e8d8
-SIZE (tt-rss-tt-rss-bfdfea88b988778db59fb112bbd07a4cd2aefd69_GL0.tar.gz) = 8583787
+TIMESTAMP = 1747000425
+SHA256 (tt-rss-tt-rss-f097c5ed97671f66be71e52c13917c23528ba308_GL0.tar.gz) = 996189e8a7acdc5e8b44fb181b0ff7f6ce746acca77a43e300c0af56efa40b6f
+SIZE (tt-rss-tt-rss-f097c5ed97671f66be71e52c13917c23528ba308_GL0.tar.gz) = 8712416
diff --git a/www/tt-rss/pkg-plist b/www/tt-rss/pkg-plist
index 0cbc91f943f5..5818ba98cf63 100644
--- a/www/tt-rss/pkg-plist
+++ b/www/tt-rss/pkg-plist
@@ -36,6 +36,7 @@
%%WWWDIR%%/classes/Cache_Local.php
%%WWWDIR%%/classes/Config.php
%%WWWDIR%%/classes/Counters.php
+%%WWWDIR%%/classes/Crypt.php
%%WWWDIR%%/classes/Db.php
%%WWWDIR%%/classes/Db_Migrations.php
%%WWWDIR%%/classes/Db_Prefs.php
@@ -1979,6 +1980,8 @@
%%WWWDIR%%/locale/ru_RU/LC_MESSAGES/messages.po
%%WWWDIR%%/locale/sv_SE/LC_MESSAGES/messages.mo
%%WWWDIR%%/locale/sv_SE/LC_MESSAGES/messages.po
+%%WWWDIR%%/locale/ta/LC_MESSAGES/messages.mo
+%%WWWDIR%%/locale/ta/LC_MESSAGES/messages.po
%%WWWDIR%%/locale/tr_TR/LC_MESSAGES/messages.mo
%%WWWDIR%%/locale/tr_TR/LC_MESSAGES/messages.po
%%WWWDIR%%/locale/uk_UA/LC_MESSAGES/messages.mo
@@ -2045,7 +2048,6 @@
%%WWWDIR%%/public.php
%%WWWDIR%%/schema/ttrss_schema_mysql.sql
%%WWWDIR%%/schema/ttrss_schema_pgsql.sql
-%%WWWDIR%%/sql/mysql/schema.sql
%%WWWDIR%%/sql/mysql/migrations/3.sql
%%WWWDIR%%/sql/mysql/migrations/4.sql
%%WWWDIR%%/sql/mysql/migrations/5.sql
@@ -2191,7 +2193,9 @@
%%WWWDIR%%/sql/mysql/migrations/145.sql
%%WWWDIR%%/sql/mysql/migrations/146.sql
%%WWWDIR%%/sql/mysql/migrations/147.sql
-%%WWWDIR%%/sql/pgsql/schema.sql
+%%WWWDIR%%/sql/mysql/migrations/148.sql
+%%WWWDIR%%/sql/mysql/migrations/149.sql
+%%WWWDIR%%/sql/mysql/schema.sql
%%WWWDIR%%/sql/pgsql/migrations/3.sql
%%WWWDIR%%/sql/pgsql/migrations/4.sql
%%WWWDIR%%/sql/pgsql/migrations/5.sql
@@ -2337,6 +2341,9 @@
%%WWWDIR%%/sql/pgsql/migrations/145.sql
%%WWWDIR%%/sql/pgsql/migrations/146.sql
%%WWWDIR%%/sql/pgsql/migrations/147.sql
+%%WWWDIR%%/sql/pgsql/migrations/148.sql
+%%WWWDIR%%/sql/pgsql/migrations/149.sql
+%%WWWDIR%%/sql/pgsql/schema.sql
%%WWWDIR%%/templates.local/index.html
%%WWWDIR%%/templates/digest_template.txt
%%WWWDIR%%/templates/digest_template_html.txt
@@ -2407,8 +2414,8 @@
%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/Hanzi.php
%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/Kanji.php
%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/Number.php
-%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/QRData.php
%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/QRCodeDataException.php
+%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/QRData.php
%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/QRDataModeAbstract.php
%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/QRDataModeInterface.php
%%WWWDIR%%/vendor/chillerlan/php-qrcode/src/Data/QRMatrix.php
diff --git a/www/typo3-12/Makefile b/www/typo3-12/Makefile
index a1edb26741b0..debae5bfffd5 100644
--- a/www/typo3-12/Makefile
+++ b/www/typo3-12/Makefile
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_src-${DISTVERSION}
PORT_V_MAJOR= 12
PORT_V_MINOR= 4
-PORT_V_PATCH= 28
+PORT_V_PATCH= 31
TYPO3DIR= www/${PORTNAME}-${PORT_V_MAJOR}
diff --git a/www/typo3-12/distinfo b/www/typo3-12/distinfo
index 7ecfc3395f59..8ba5a3b50a56 100644
--- a/www/typo3-12/distinfo
+++ b/www/typo3-12/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742309083
-SHA256 (typo3_src-12.4.28.tar.gz) = 000c7dd6cb940592ce83c683837862086d29d8809aca7bd5cc92180c8e94b2cc
-SIZE (typo3_src-12.4.28.tar.gz) = 26593637
+TIMESTAMP = 1747746945
+SHA256 (typo3_src-12.4.31.tar.gz) = 69e71c0be15291eb56db09ab305c942b499da434a9d9042b9e0662b1a9783681
+SIZE (typo3_src-12.4.31.tar.gz) = 26607292
diff --git a/www/typo3-13/Makefile b/www/typo3-13/Makefile
index 651851cca9e2..7ed4243700ca 100644
--- a/www/typo3-13/Makefile
+++ b/www/typo3-13/Makefile
@@ -1,6 +1,6 @@
PORTNAME= typo3
DISTVERSION= ${PORT_V_MAJOR}.${PORT_V_MINOR}.${PORT_V_PATCH}
-PORTREVISION= 1
+#PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://cdn.typo3.com/typo3/${DISTVERSION}/
PKGNAMESUFFIX= -${PORT_V_MAJOR}${PHP_PKGNAMESUFFIX}
@@ -32,7 +32,7 @@ SUB_LIST+= PREFIX=${PREFIX} \
PORT_V_MAJOR= 13
PORT_V_MINOR= 4
-PORT_V_PATCH= 8
+PORT_V_PATCH= 12
TYPO3DIR= www/${PORTNAME}-${PORT_V_MAJOR}
diff --git a/www/typo3-13/distinfo b/www/typo3-13/distinfo
index e0f4de0680f6..2b6bd6c63362 100644
--- a/www/typo3-13/distinfo
+++ b/www/typo3-13/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742309756
-SHA256 (typo3_src-13.4.8.tar.gz) = f851dc46e54d3997c5de16133a41d32283ccc49049882a4d8b97a60e87aa02cf
-SIZE (typo3_src-13.4.8.tar.gz) = 25531952
+TIMESTAMP = 1747749336
+SHA256 (typo3_src-13.4.12.tar.gz) = 6d6cbf20c0941592a0c4d85aa540e25564e06de05b33b77f322fee7d42396481
+SIZE (typo3_src-13.4.12.tar.gz) = 25573553
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile
index 616c569e77cd..1c0da59d7a65 100644
--- a/www/ungoogled-chromium/Makefile
+++ b/www/ungoogled-chromium/Makefile
@@ -1,5 +1,6 @@
PORTNAME= ungoogled-chromium
-PORTVERSION= 136.0.7103.92
+PORTVERSION= 136.0.7103.113
+PORTREVISION= 1
PULSEMV= 16
PULSEV= ${PULSEMV}.1
UGVERSION= ${DISTVERSION}-1
@@ -20,7 +21,7 @@ WWW= https://github.com/ungoogled-software/ungoogled-chromium
LICENSE= BSD3CLAUSE LGPL21 MPL11
LICENSE_COMB= multi
-ONLY_FOR_ARCHS= aarch64 amd64 i386
+ONLY_FOR_ARCHS= aarch64 amd64
PATCH_DEPENDS= gpatch:devel/patch \
${PYTHON_VERSION}:lang/python${PYTHON_SUFFIX}
diff --git a/www/ungoogled-chromium/distinfo b/www/ungoogled-chromium/distinfo
index ff9869865cd1..f53ddc783f79 100644
--- a/www/ungoogled-chromium/distinfo
+++ b/www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1746691040
-SHA256 (chromium-136.0.7103.92.tar.xz) = 3fa7f88ef186566948367bf1e9a9f0612e753fc69285c1654728f6a015cd4cf2
-SIZE (chromium-136.0.7103.92.tar.xz) = 7188412240
+TIMESTAMP = 1747298437
+SHA256 (chromium-136.0.7103.113.tar.xz) = 7c765bd13df842a28bb52279b8d711411ac6082151473e07bd70b9a482c0a0ac
+SIZE (chromium-136.0.7103.113.tar.xz) = 7196537592
SHA256 (pulseaudio-16.1.tar.gz) = 027266c62f2a84422ac45fa721a649508f0f1628fb1fd9242315ac54ce2d7c92
SIZE (pulseaudio-16.1.tar.gz) = 2763111
-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
+SHA256 (chromium-136.0.7103.113-testdata.tar.xz) = cbf264643986db5b7aa91843ea64a1b9e23d00bb226b234d4f60788469a58ef8
+SIZE (chromium-136.0.7103.113-testdata.tar.xz) = 651614116
+SHA256 (ungoogled-software-ungoogled-chromium-136.0.7103.113-136.0.7103.113-1_GH0.tar.gz) = ab4c1b21292b860eaa750d3fb9ee73dae58a86d2dd59d4e41e06102e8c9f635a
+SIZE (ungoogled-software-ungoogled-chromium-136.0.7103.113-136.0.7103.113-1_GH0.tar.gz) = 633301
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_BUILD.gn b/www/ungoogled-chromium/files/patch-build_rust_allocator_BUILD.gn
new file mode 100644
index 000000000000..cb1633140dcc
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_BUILD.gn
@@ -0,0 +1,109 @@
+--- build/rust/allocator/BUILD.gn.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/BUILD.gn
+@@ -0,0 +1,106 @@
++# Copyright 2025 The Chromium Authors
++# Use of this source code is governed by a BSD-style license that can be
++# found in the LICENSE file.
++
++import("//build/buildflag_header.gni")
++import("//build/config/rust.gni")
++import("//build/rust/rust_static_library.gni")
++
++rust_allocator_uses_partition_alloc = false
++if (build_with_chromium) {
++ import("//base/allocator/partition_allocator/partition_alloc.gni")
++ rust_allocator_uses_partition_alloc = use_partition_alloc_as_malloc
++}
++
++# In ASAN builds, PartitionAlloc-Everywhere is disabled, meaning malloc() and
++# friends in C++ do not go to PartitionAlloc. So we also don't point the Rust
++# allocation functions at PartitionAlloc. Generally, this means we just direct
++# them to the Standard Library's allocator.
++#
++# However, on Windows the Standard Library uses HeapAlloc() and Windows ASAN
++# does *not* hook that method, so ASAN does not get to hear about allocations
++# made in Rust. To resolve this, we redirect allocation to _aligned_malloc
++# which Windows ASAN *does* hook.
++#
++# Note that there is a runtime option to make ASAN hook HeapAlloc() but
++# enabling it breaks Win32 APIs like CreateProcess:
++# https://crbug.com/368070343#comment29
++rust_allocator_uses_aligned_malloc = false
++if (!rust_allocator_uses_partition_alloc && is_win && is_asan) {
++ rust_allocator_uses_aligned_malloc = true
++}
++
++rust_allocator_uses_allocator_impls_h =
++ rust_allocator_uses_partition_alloc || rust_allocator_uses_aligned_malloc
++
++buildflag_header("buildflags") {
++ header = "buildflags.h"
++ flags = [
++ "RUST_ALLOCATOR_USES_PARTITION_ALLOC=$rust_allocator_uses_partition_alloc",
++ "RUST_ALLOCATOR_USES_ALIGNED_MALLOC=$rust_allocator_uses_aligned_malloc",
++ ]
++ visibility = [ ":*" ]
++}
++
++if (toolchain_has_rust) {
++ # All targets which depend on Rust code but are not linked by rustc must
++ # depend on this. Usually, this dependency will come from the rust_target() GN
++ # template. However, cargo_crate() does *not* include this dependency so any
++ # C++ targets which directly depend on a cargo_crate() must depend on this.
++ rust_static_library("allocator") {
++ sources = [ "lib.rs" ]
++ crate_root = "lib.rs"
++ cxx_bindings = [ "lib.rs" ]
++
++ deps = [ ":alloc_error_handler_impl" ]
++ if (rust_allocator_uses_allocator_impls_h) {
++ deps += [ ":allocator_impls" ]
++ }
++
++ no_chromium_prelude = true
++ no_allocator_crate = true
++ allow_unsafe = true
++
++ rustflags = []
++ if (rust_allocator_uses_allocator_impls_h) {
++ rustflags += [ "--cfg=rust_allocator_uses_allocator_impls_h" ]
++ cxx_bindings += [ "allocator_impls_ffi.rs" ]
++ sources += [ "allocator_impls_ffi.rs" ]
++ }
++
++ # TODO(https://crbug.com/410596442): Stop using unstable features here.
++ configs -= [ "//build/config/compiler:disallow_unstable_features" ]
++ }
++
++ if (rust_allocator_uses_allocator_impls_h) {
++ static_library("allocator_impls") {
++ public_deps = []
++ if (rust_allocator_uses_partition_alloc) {
++ public_deps +=
++ [ "//base/allocator/partition_allocator:partition_alloc" ]
++ }
++
++ sources = [
++ "allocator_impls.cc",
++ "allocator_impls.h",
++ ]
++ deps = [ ":buildflags" ]
++ visibility = [ ":*" ]
++ }
++ }
++
++ static_library("alloc_error_handler_impl") {
++ sources = [
++ # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
++ # copied from `//base`.
++ # TODO(crbug.com/40279749): Avoid duplication / reuse code.
++ "alias.cc",
++ "alias.h",
++ "alloc_error_handler_impl.cc",
++ "alloc_error_handler_impl.h",
++ "compiler_specific.h",
++ "immediate_crash.h",
++ ]
++ visibility = [ ":*" ]
++ }
++}
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_DEPS b/www/ungoogled-chromium/files/patch-build_rust_allocator_DEPS
new file mode 100644
index 000000000000..74bb2d6c2421
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_DEPS
@@ -0,0 +1,12 @@
+--- build/rust/allocator/DEPS.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/DEPS
+@@ -0,0 +1,9 @@
++include_rules = [
++ "-base",
++]
++
++specific_include_rules = {
++ "allocator_impls.cc" : [
++ "+partition_alloc"
++ ]
++}
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_alias.cc b/www/ungoogled-chromium/files/patch-build_rust_allocator_alias.cc
new file mode 100644
index 000000000000..5280641f27e1
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_alias.cc
@@ -0,0 +1,25 @@
+--- build/rust/allocator/alias.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alias.cc
+@@ -0,0 +1,22 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/debug/alias.cc ( additionally the APIs
++// were moved into the `build_rust_std` namespace).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#include "build/rust/allocator/alias.h"
++
++#include "build/rust/allocator/compiler_specific.h"
++
++namespace build_rust_std {
++namespace debug {
++
++// This file/function should be excluded from LTO/LTCG to ensure that the
++// compiler can't see this function's implementation when compiling calls to it.
++NOINLINE void Alias(const void* var) {}
++
++} // namespace debug
++} // namespace build_rust_std
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_alias.h b/www/ungoogled-chromium/files/patch-build_rust_allocator_alias.h
new file mode 100644
index 000000000000..6530c6ae8779
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_alias.h
@@ -0,0 +1,40 @@
+--- build/rust/allocator/alias.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alias.h
+@@ -0,0 +1,37 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/debug/alias.h (and then trimmed to just
++// the APIs / macros needed by //build/rust/std; additionally the APIs were
++// moved into the `build_rust_std` namespace).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALIAS_H_
++#define BUILD_RUST_ALLOCATOR_ALIAS_H_
++
++#include <stddef.h>
++
++namespace build_rust_std {
++namespace debug {
++
++// Make the optimizer think that |var| is aliased. This can be used to prevent a
++// local variable from being optimized out (which is something that
++// `NO_CODE_FOLDING` macro definition below depends on). See
++// //base/debug/alias.h for more details.
++void Alias(const void* var);
++
++} // namespace debug
++
++} // namespace build_rust_std
++
++// Prevent code folding (where a linker identifies functions that are
++// bit-identical and overlays them, which saves space but it leads to confusing
++// call stacks because multiple symbols are at the same address). See
++// //base/debug/alias.h for more details.
++#define NO_CODE_FOLDING() \
++ const int line_number = __LINE__; \
++ build_rust_std::debug::Alias(&line_number)
++
++#endif // BUILD_RUST_ALLOCATOR_ALIAS_H_
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc b/www/ungoogled-chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc
new file mode 100644
index 000000000000..048c267abefa
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.cc
@@ -0,0 +1,20 @@
+--- build/rust/allocator/alloc_error_handler_impl.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alloc_error_handler_impl.cc
+@@ -0,0 +1,17 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "build/rust/allocator/alloc_error_handler_impl.h"
++
++#include "build/rust/allocator/alias.h"
++#include "build/rust/allocator/immediate_crash.h"
++
++namespace rust_allocator_internal {
++
++void alloc_error_handler_impl() {
++ NO_CODE_FOLDING();
++ IMMEDIATE_CRASH();
++}
++
++} // namespace rust_allocator_internal
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.h b/www/ungoogled-chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.h
new file mode 100644
index 000000000000..887ea602b027
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_alloc__error__handler__impl.h
@@ -0,0 +1,24 @@
+--- build/rust/allocator/alloc_error_handler_impl.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/alloc_error_handler_impl.h
+@@ -0,0 +1,21 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
++#define BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
++
++// This header exposes to Rust a C++ implementation of quickly crashing after an
++// allocation error. (The API below is called from `__rust_alloc_error_handler`
++// in `lib.rs`.)
++//
++// TODO(lukasza): Investigate if we can delete this `.h` / `.cc` and just call
++// `std::process::abort()` (or something else?) directly from `.rs`. The main
++// open question is how much we care about `NO_CODE_FOLDING`.
++namespace rust_allocator_internal {
++
++void alloc_error_handler_impl();
++
++} // namespace rust_allocator_internal
++
++#endif // BUILD_RUST_ALLOCATOR_ALLOC_ERROR_HANDLER_IMPL_H_
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls.cc b/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls.cc
new file mode 100644
index 000000000000..94e04d7b966a
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls.cc
@@ -0,0 +1,108 @@
+--- build/rust/allocator/allocator_impls.cc.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls.cc
+@@ -0,0 +1,105 @@
++// Copyright 2021 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "build/rust/allocator/allocator_impls.h"
++
++#ifdef UNSAFE_BUFFERS_BUILD
++// TODO(crbug.com/390223051): Remove C-library calls to fix the errors.
++#pragma allow_unsafe_libc_calls
++#endif
++
++#include <cstddef>
++#include <cstring>
++
++#include "build/build_config.h"
++#include "build/rust/allocator/buildflags.h"
++
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++#include "partition_alloc/partition_alloc_constants.h" // nogncheck
++#include "partition_alloc/shim/allocator_shim.h" // nogncheck
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++#include <cstdlib>
++#endif
++
++namespace rust_allocator_internal {
++
++unsigned char* alloc(size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ // PartitionAlloc will crash if given an alignment larger than this.
++ if (align > partition_alloc::internal::kMaxSupportedAlignment) {
++ return nullptr;
++ }
++
++ // We use unchecked allocation paths in PartitionAlloc rather than going
++ // through its shims in `malloc()` etc so that we can support fallible
++ // allocation paths such as Vec::try_reserve without crashing on allocation
++ // failure.
++ if (align <= alignof(std::max_align_t)) {
++ return static_cast<unsigned char*>(allocator_shim::UncheckedAlloc(size));
++ } else {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedAlignedAlloc(size, align));
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return static_cast<unsigned char*>(_aligned_malloc(size, align));
++#else
++#error This configuration is not supported.
++#endif
++}
++
++void dealloc(unsigned char* p, size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ if (align <= alignof(std::max_align_t)) {
++ allocator_shim::UncheckedFree(p);
++ } else {
++ allocator_shim::UncheckedAlignedFree(p);
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return _aligned_free(p);
++#else
++#error This configuration is not supported.
++#endif
++}
++
++unsigned char* realloc(unsigned char* p,
++ size_t old_size,
++ size_t align,
++ size_t new_size) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC)
++ // We use unchecked allocation paths in PartitionAlloc rather than going
++ // through its shims in `malloc()` etc so that we can support fallible
++ // allocation paths such as Vec::try_reserve without crashing on allocation
++ // failure.
++ if (align <= alignof(std::max_align_t)) {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedRealloc(p, new_size));
++ } else {
++ return static_cast<unsigned char*>(
++ allocator_shim::UncheckedAlignedRealloc(p, new_size, align));
++ }
++#elif BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ return static_cast<unsigned char*>(_aligned_realloc(p, new_size, align));
++#else
++#error This configuration is not supported.
++#endif
++}
++
++unsigned char* alloc_zeroed(size_t size, size_t align) {
++#if BUILDFLAG(RUST_ALLOCATOR_USES_PARTITION_ALLOC) || \
++ BUILDFLAG(RUST_ALLOCATOR_USES_ALIGNED_MALLOC)
++ // TODO(danakj): When RUST_ALLOCATOR_USES_PARTITION_ALLOC is true, it's
++ // possible that a partition_alloc::UncheckedAllocZeroed() call would perform
++ // better than partition_alloc::UncheckedAlloc() + memset. But there is no
++ // such API today. See b/342251590.
++ unsigned char* p = alloc(size, align);
++ if (p) {
++ memset(p, 0, size);
++ }
++ return p;
++#else
++#error This configuration is not supported.
++#endif
++}
++
++} // namespace rust_allocator_internal
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls.h b/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls.h
new file mode 100644
index 000000000000..9249cdc938d2
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls.h
@@ -0,0 +1,27 @@
+--- build/rust/allocator/allocator_impls.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls.h
+@@ -0,0 +1,24 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
++#define BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
++
++#include <cstddef>
++
++// This header exposes a C++ allocator (e.g. PartitionAlloc) to Rust.
++// The APIs below are called from `impl GlobalAlloc` in `lib.rs`.
++namespace rust_allocator_internal {
++
++unsigned char* alloc(size_t size, size_t align);
++void dealloc(unsigned char* p, size_t size, size_t align);
++unsigned char* realloc(unsigned char* p,
++ size_t old_size,
++ size_t align,
++ size_t new_size);
++unsigned char* alloc_zeroed(size_t size, size_t align);
++
++} // namespace rust_allocator_internal
++
++#endif // BUILD_RUST_ALLOCATOR_ALLOCATOR_IMPLS_H_
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs b/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs
new file mode 100644
index 000000000000..8f0baf1576ce
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_allocator__impls__ffi.rs
@@ -0,0 +1,22 @@
+--- build/rust/allocator/allocator_impls_ffi.rs.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/allocator_impls_ffi.rs
+@@ -0,0 +1,19 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++//! FFI for `allocator_impls.h` is in a separate `.rs` file/module to
++//! better support conditional compilation (these functions are only
++//! used under `#[cfg(rust_allocator_uses_allocator_impls_h)]`.
++
++#[cxx::bridge(namespace = "rust_allocator_internal")]
++pub mod ffi {
++ extern "C++" {
++ include!("build/rust/allocator/allocator_impls.h");
++
++ unsafe fn alloc(size: usize, align: usize) -> *mut u8;
++ unsafe fn dealloc(p: *mut u8, size: usize, align: usize);
++ unsafe fn realloc(p: *mut u8, old_size: usize, align: usize, new_size: usize) -> *mut u8;
++ unsafe fn alloc_zeroed(size: usize, align: usize) -> *mut u8;
++ }
++}
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_compiler__specific.h b/www/ungoogled-chromium/files/patch-build_rust_allocator_compiler__specific.h
new file mode 100644
index 000000000000..7feb0c739d79
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_compiler__specific.h
@@ -0,0 +1,41 @@
+--- build/rust/allocator/compiler_specific.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/compiler_specific.h
+@@ -0,0 +1,38 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/compiler_specific.h (and then
++// significantly trimmed to just the APIs / macros needed by //build/rust/std).
++//
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
++#define BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
++
++#include "build/build_config.h"
++
++#if defined(COMPILER_MSVC) && !defined(__clang__)
++#error "Only clang-cl is supported on Windows, see https://crbug.com/988071"
++#endif
++
++#if defined(__has_attribute)
++#define HAS_ATTRIBUTE(x) __has_attribute(x)
++#else
++#define HAS_ATTRIBUTE(x) 0
++#endif
++
++// Annotate a function indicating it should not be inlined.
++// Use like:
++// NOINLINE void DoStuff() { ... }
++#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
++#define NOINLINE [[clang::noinline]]
++#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
++#define NOINLINE __attribute__((noinline))
++#elif defined(COMPILER_MSVC)
++#define NOINLINE __declspec(noinline)
++#else
++#define NOINLINE
++#endif
++
++#endif // BUILD_RUST_ALLOCATOR_COMPILER_SPECIFIC_H_
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_immediate__crash.h b/www/ungoogled-chromium/files/patch-build_rust_allocator_immediate__crash.h
new file mode 100644
index 000000000000..7ab0f9d9c34c
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_immediate__crash.h
@@ -0,0 +1,174 @@
+--- build/rust/allocator/immediate_crash.h.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/immediate_crash.h
+@@ -0,0 +1,171 @@
++// Copyright 2021 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++// This file has been copied from //base/immediate_crash.h.
++// TODO(crbug.com/40279749): Avoid code duplication / reuse code.
++
++#ifndef BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
++#define BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
++
++#include "build/build_config.h"
++
++// Crashes in the fastest possible way with no attempt at logging.
++// There are several constraints; see http://crbug.com/664209 for more context.
++//
++// - TRAP_SEQUENCE_() must be fatal. It should not be possible to ignore the
++// resulting exception or simply hit 'continue' to skip over it in a debugger.
++// - Different instances of TRAP_SEQUENCE_() must not be folded together, to
++// ensure crash reports are debuggable. Unlike __builtin_trap(), asm volatile
++// blocks will not be folded together.
++// Note: TRAP_SEQUENCE_() previously required an instruction with a unique
++// nonce since unlike clang, GCC folds together identical asm volatile
++// blocks.
++// - TRAP_SEQUENCE_() must produce a signal that is distinct from an invalid
++// memory access.
++// - TRAP_SEQUENCE_() must be treated as a set of noreturn instructions.
++// __builtin_unreachable() is used to provide that hint here. clang also uses
++// this as a heuristic to pack the instructions in the function epilogue to
++// improve code density.
++//
++// Additional properties that are nice to have:
++// - TRAP_SEQUENCE_() should be as compact as possible.
++// - The first instruction of TRAP_SEQUENCE_() should not change, to avoid
++// shifting crash reporting clusters. As a consequence of this, explicit
++// assembly is preferred over intrinsics.
++// Note: this last bullet point may no longer be true, and may be removed in
++// the future.
++
++// Note: TRAP_SEQUENCE Is currently split into two macro helpers due to the fact
++// that clang emits an actual instruction for __builtin_unreachable() on certain
++// platforms (see https://crbug.com/958675). In addition, the int3/bkpt/brk will
++// be removed in followups, so splitting it up like this now makes it easy to
++// land the followups.
++
++#if defined(COMPILER_GCC)
++
++#if BUILDFLAG(IS_NACL)
++
++// Crash report accuracy is not guaranteed on NaCl.
++#define TRAP_SEQUENCE1_() __builtin_trap()
++#define TRAP_SEQUENCE2_() asm volatile("")
++
++#elif defined(ARCH_CPU_X86_FAMILY)
++
++// TODO(crbug.com/40625592): In theory, it should be possible to use just
++// int3. However, there are a number of crashes with SIGILL as the exception
++// code, so it seems likely that there's a signal handler that allows execution
++// to continue after SIGTRAP.
++#define TRAP_SEQUENCE1_() asm volatile("int3")
++
++#if BUILDFLAG(IS_APPLE)
++// Intentionally empty: __builtin_unreachable() is always part of the sequence
++// (see IMMEDIATE_CRASH below) and already emits a ud2 on Mac.
++#define TRAP_SEQUENCE2_() asm volatile("")
++#else
++#define TRAP_SEQUENCE2_() asm volatile("ud2")
++#endif // BUILDFLAG(IS_APPLE)
++
++#elif defined(ARCH_CPU_ARMEL)
++
++// bkpt will generate a SIGBUS when running on armv7 and a SIGTRAP when running
++// as a 32 bit userspace app on arm64. There doesn't seem to be any way to
++// cause a SIGTRAP from userspace without using a syscall (which would be a
++// problem for sandboxing).
++// TODO(crbug.com/40625592): Remove bkpt from this sequence.
++#define TRAP_SEQUENCE1_() asm volatile("bkpt #0")
++#define TRAP_SEQUENCE2_() asm volatile("udf #0")
++
++#elif defined(ARCH_CPU_ARM64)
++
++// This will always generate a SIGTRAP on arm64.
++// TODO(crbug.com/40625592): Remove brk from this sequence.
++#define TRAP_SEQUENCE1_() asm volatile("brk #0")
++#define TRAP_SEQUENCE2_() asm volatile("hlt #0")
++
++#else
++
++// Crash report accuracy will not be guaranteed on other architectures, but at
++// least this will crash as expected.
++#define TRAP_SEQUENCE1_() __builtin_trap()
++#define TRAP_SEQUENCE2_() asm volatile("")
++
++#endif // ARCH_CPU_*
++
++#elif defined(COMPILER_MSVC)
++
++#if !defined(__clang__)
++
++// MSVC x64 doesn't support inline asm, so use the MSVC intrinsic.
++#define TRAP_SEQUENCE1_() __debugbreak()
++#define TRAP_SEQUENCE2_()
++
++#elif defined(ARCH_CPU_ARM64)
++
++// Windows ARM64 uses "BRK #F000" as its breakpoint instruction, and
++// __debugbreak() generates that in both VC++ and clang.
++#define TRAP_SEQUENCE1_() __debugbreak()
++// Intentionally empty: __builtin_unreachable() is always part of the sequence
++// (see IMMEDIATE_CRASH below) and already emits a ud2 on Win64,
++// https://crbug.com/958373
++#define TRAP_SEQUENCE2_() __asm volatile("")
++
++#else
++
++#define TRAP_SEQUENCE1_() asm volatile("int3")
++#define TRAP_SEQUENCE2_() asm volatile("ud2")
++
++#endif // __clang__
++
++#else
++
++#error No supported trap sequence!
++
++#endif // COMPILER_GCC
++
++#define TRAP_SEQUENCE_() \
++ do { \
++ TRAP_SEQUENCE1_(); \
++ TRAP_SEQUENCE2_(); \
++ } while (false)
++
++// CHECK() and the trap sequence can be invoked from a constexpr function.
++// This could make compilation fail on GCC, as it forbids directly using inline
++// asm inside a constexpr function. However, it allows calling a lambda
++// expression including the same asm.
++// The side effect is that the top of the stacktrace will not point to the
++// calling function, but to this anonymous lambda. This is still useful as the
++// full name of the lambda will typically include the name of the function that
++// calls CHECK() and the debugger will still break at the right line of code.
++#if !defined(COMPILER_GCC) || defined(__clang__)
++
++#define WRAPPED_TRAP_SEQUENCE_() TRAP_SEQUENCE_()
++
++#else
++
++#define WRAPPED_TRAP_SEQUENCE_() \
++ do { \
++ [] { TRAP_SEQUENCE_(); }(); \
++ } while (false)
++
++#endif // !defined(COMPILER_GCC) || defined(__clang__)
++
++#if defined(__clang__) || defined(COMPILER_GCC)
++
++// __builtin_unreachable() hints to the compiler that this is noreturn and can
++// be packed in the function epilogue.
++#define IMMEDIATE_CRASH() \
++ ({ \
++ WRAPPED_TRAP_SEQUENCE_(); \
++ __builtin_unreachable(); \
++ })
++
++#else
++
++// This is supporting non-chromium user of logging.h to build with MSVC, like
++// pdfium. On MSVC there is no __builtin_unreachable().
++#define IMMEDIATE_CRASH() WRAPPED_TRAP_SEQUENCE_()
++
++#endif // defined(__clang__) || defined(COMPILER_GCC)
++
++#endif // BUILD_RUST_ALLOCATOR_IMMEDIATE_CRASH_H_
diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs b/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs
new file mode 100644
index 000000000000..89fddf278294
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs
@@ -0,0 +1,122 @@
+--- build/rust/allocator/lib.rs.orig 2025-05-20 09:16:26 UTC
++++ build/rust/allocator/lib.rs
+@@ -0,0 +1,119 @@
++// Copyright 2025 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++//! Define the allocator that Rust code in Chrome should use.
++//!
++//! Any final artifact that depends on this crate, even transitively, will use
++//! the allocator defined here.
++//!
++//! List of known issues:
++//!
++//! 1. We'd like to use PartitionAlloc on Windows, but the stdlib uses Windows
++//! heap functions directly that PartitionAlloc can not intercept.
++//! 2. We'd like `Vec::try_reserve` to fail at runtime on Linux instead of
++//! crashing in malloc() where PartitionAlloc replaces that function.
++
++// Required to apply weak linkage to symbols.
++//
++// TODO(https://crbug.com/410596442): Stop using unstable features here.
++// https://github.com/rust-lang/rust/issues/29603 tracks stabilization of the `linkage` feature.
++#![feature(linkage)]
++// Required to apply `#[rustc_std_internal_symbol]` to our alloc error handler
++// so the name is correctly mangled as rustc expects.
++//
++// TODO(https://crbug.com/410596442): Stop using internal features here.
++#![allow(internal_features)]
++#![feature(rustc_attrs)]
++
++// This module is in a separate source file to avoid having to teach `cxxbridge`
++// about conditional compilation.
++#[cfg(rust_allocator_uses_allocator_impls_h)]
++mod allocator_impls_ffi;
++
++/// Module that provides `#[global_allocator]` / `GlobalAlloc` interface for
++/// using an allocator from C++.
++#[cfg(rust_allocator_uses_allocator_impls_h)]
++mod cpp_allocator {
++ use super::allocator_impls_ffi::ffi;
++ use std::alloc::{GlobalAlloc, Layout};
++
++ struct Allocator;
++
++ unsafe impl GlobalAlloc for Allocator {
++ unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
++ unsafe { ffi::alloc(layout.size(), layout.align()) }
++ }
++
++ unsafe fn dealloc(&self, ptr: *mut u8, layout: Layout) {
++ unsafe {
++ ffi::dealloc(ptr, layout.size(), layout.align());
++ }
++ }
++
++ unsafe fn alloc_zeroed(&self, layout: Layout) -> *mut u8 {
++ unsafe { ffi::alloc_zeroed(layout.size(), layout.align()) }
++ }
++
++ unsafe fn realloc(&self, ptr: *mut u8, layout: Layout, new_size: usize) -> *mut u8 {
++ unsafe { ffi::realloc(ptr, layout.size(), layout.align(), new_size) }
++ }
++ }
++
++ #[global_allocator]
++ static GLOBAL: Allocator = Allocator;
++}
++
++/// Module that provides `#[global_allocator]` / `GlobalAlloc` interface for
++/// using the default Rust allocator.
++#[cfg(not(rust_allocator_uses_allocator_impls_h))]
++mod rust_allocator {
++ #[global_allocator]
++ static GLOBAL: std::alloc::System = std::alloc::System;
++}
++
++/// Module that provides global symbols that are needed both by `cpp_allocator`
++/// and `rust_allocator`.
++///
++/// When `rustc` drives linking, then it will define the symbols below. But
++/// Chromium only uses `rustc` to link Rust-only executables (e.g. `build.rs`
++/// scripts) and otherwise uses a non-Rust linker. This is why we have to
++/// manually define a few symbols below. We define those symbols
++/// as "weak" symbols, so that Rust-provided symbols "win" in case where Rust
++/// actually does drive the linking. This hack works (not only for Chromium,
++/// but also for google3 and other projects), but isn't officially supported by
++/// `rustc`.
++///
++/// TODO(https://crbug.com/410596442): Stop using internal features here.
++mod both_allocators {
++ /// As part of rustc's contract for using `#[global_allocator]` without
++ /// rustc-generated shims we must define this symbol, since we are opting in
++ /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015
++ #[no_mangle]
++ #[linkage = "weak"]
++ static __rust_no_alloc_shim_is_unstable: u8 = 0;
++
++ // Mangle the symbol name as rustc expects.
++ #[rustc_std_internal_symbol]
++ #[allow(non_upper_case_globals)]
++ #[linkage = "weak"]
++ static __rust_alloc_error_handler_should_panic: u8 = 0;
++
++ // Mangle the symbol name as rustc expects.
++ #[rustc_std_internal_symbol]
++ #[allow(non_upper_case_globals)]
++ #[linkage = "weak"]
++ fn __rust_alloc_error_handler(_size: usize, _align: usize) {
++ // TODO(lukasza): Investigate if we can just call `std::process::abort()` here.
++ // (Not really _needed_, but it could simplify code a little bit.)
++ unsafe { ffi::alloc_error_handler_impl() }
++ }
++
++ #[cxx::bridge(namespace = "rust_allocator_internal")]
++ mod ffi {
++ extern "C++" {
++ include!("build/rust/allocator/alloc_error_handler_impl.h");
++ unsafe fn alloc_error_handler_impl();
++ }
++ }
++}
diff --git a/www/ungoogled-chromium/files/patch-build_rust_cargo__crate.gni b/www/ungoogled-chromium/files/patch-build_rust_cargo__crate.gni
new file mode 100644
index 000000000000..a1590f727aa3
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_cargo__crate.gni
@@ -0,0 +1,25 @@
+--- build/rust/cargo_crate.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/cargo_crate.gni
+@@ -259,6 +259,12 @@ template("cargo_crate") {
+ # Don't import the `chromium` crate into third-party code.
+ no_chromium_prelude = true
+
++ # Don't depend on the chrome-specific #[global_allocator] crate from
++ # third-party code. This avoids some dependency cycle issues. The allocator
++ # crate will still be used if it exists anywhere in the dependency graph for
++ # a given linked artifact.
++ no_allocator_crate = true
++
+ rustc_metadata = _rustc_metadata
+
+ # TODO(crbug.com/40259764): don't default to true. This requires changes to
+@@ -482,6 +488,9 @@ template("cargo_crate") {
+
+ # Don't import the `chromium` crate into third-party code.
+ no_chromium_prelude = true
++
++ # Build scripts do not need to link to chrome's allocator.
++ no_allocator_crate = true
+
+ # The ${_build_script_name}_output target looks for the exe in this
+ # location. Due to how the Windows component build works, this has to
diff --git a/www/ungoogled-chromium/files/patch-build_rust_rust__macro.gni b/www/ungoogled-chromium/files/patch-build_rust_rust__macro.gni
new file mode 100644
index 000000000000..0dafc3819aa1
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_rust__macro.gni
@@ -0,0 +1,12 @@
+--- build/rust/rust_macro.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/rust_macro.gni
+@@ -16,6 +16,9 @@ template("rust_macro") {
+ forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
+ proc_macro_configs = invoker.configs
+ target_type = "rust_proc_macro"
++
++ # Macros are loaded by rustc and shouldn't use chrome's allocation routines.
++ no_allocator_crate = true
+ }
+ }
+
diff --git a/www/ungoogled-chromium/files/patch-build_rust_rust__target.gni b/www/ungoogled-chromium/files/patch-build_rust_rust__target.gni
new file mode 100644
index 000000000000..f4ad6f04fc45
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-build_rust_rust__target.gni
@@ -0,0 +1,13 @@
+--- build/rust/rust_target.gni.orig 2025-05-20 09:16:26 UTC
++++ build/rust/rust_target.gni
+@@ -339,6 +339,10 @@ template("rust_target") {
+ _rust_deps += [ "//build/rust/std" ]
+ }
+
++ if (!defined(invoker.no_allocator_crate) || !invoker.no_allocator_crate) {
++ _rust_deps += [ "//build/rust/allocator" ]
++ }
++
+ if (_build_unit_tests) {
+ _unit_test_target = "${_target_name}_unittests"
+ if (defined(invoker.unit_test_target)) {
diff --git a/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn b/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn
index 0a5335d58d48..c6c2801bd47d 100644
--- a/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn
+++ b/www/ungoogled-chromium/files/patch-build_rust_std_BUILD.gn
@@ -1,6 +1,58 @@
---- build/rust/std/BUILD.gn.orig 2025-04-05 13:54:50 UTC
+--- build/rust/std/BUILD.gn.orig 2025-05-20 09:16:26 UTC
+++ build/rust/std/BUILD.gn
-@@ -89,13 +89,20 @@ if (toolchain_has_rust) {
+@@ -15,51 +15,12 @@
+ # allocator functions to PartitionAlloc when `use_partition_alloc_as_malloc` is
+ # true, so that Rust and C++ use the same allocator backend.
+
+-import("//build/buildflag_header.gni")
+ import("//build/config/compiler/compiler.gni")
+ import("//build/config/coverage/coverage.gni")
+ import("//build/config/rust.gni")
+ import("//build/config/sanitizers/sanitizers.gni")
+
+-rust_allocator_uses_partition_alloc = false
+-if (build_with_chromium) {
+- import("//base/allocator/partition_allocator/partition_alloc.gni")
+- rust_allocator_uses_partition_alloc = use_partition_alloc_as_malloc
+-}
+-
+-buildflag_header("buildflags") {
+- header = "buildflags.h"
+- flags = [
+- "RUST_ALLOCATOR_USES_PARTITION_ALLOC=$rust_allocator_uses_partition_alloc",
+- ]
+- visibility = [ ":*" ]
+-}
+-
+ if (toolchain_has_rust) {
+- # If clang performs the link step, we need to provide the allocator symbols
+- # that are normally injected by rustc during linking.
+- #
+- # We also "happen to" use this to redirect allocations to PartitionAlloc,
+- # though that would be better done through a #[global_allocator] crate (see
+- # above).
+- source_set("remap_alloc") {
+- public_deps = []
+- if (rust_allocator_uses_partition_alloc) {
+- public_deps += [ "//base/allocator/partition_allocator:partition_alloc" ]
+- }
+- deps = [ ":buildflags" ]
+- sources = [
+- # `alias.*`, `compiler_specific.h`, and `immediate_crash.*` have been
+- # copied from `//base`.
+- # TODO(crbug.com/40279749): Avoid duplication / reuse code.
+- "alias.cc",
+- "alias.h",
+- "compiler_specific.h",
+- "immediate_crash.h",
+- "remap_alloc.cc",
+- ]
+- }
+-
+ # List of Rust stdlib rlibs which are present in the official Rust toolchain
+ # we are using from the Android team. This is usually a version or two behind
+ # nightly. Generally this matches the toolchain we build ourselves, but if
+@@ -89,13 +50,20 @@ if (toolchain_has_rust) {
# These are no longer present in the Windows toolchain.
stdlib_files += [
"addr2line",
@@ -22,7 +74,7 @@
}
if (toolchain_for_rust_host_build_tools) {
-@@ -115,7 +122,6 @@ if (toolchain_has_rust) {
+@@ -115,7 +83,6 @@ if (toolchain_has_rust) {
# don't need to pass to the C++ linker because they're used for specialized
# purposes.
skip_stdlib_files = [
@@ -30,3 +82,25 @@
"rustc_std_workspace_alloc",
"rustc_std_workspace_core",
"rustc_std_workspace_std",
+@@ -269,8 +236,6 @@ if (toolchain_has_rust) {
+ foreach(libname, stdlib_files + skip_stdlib_files) {
+ deps += [ "rules:$libname" ]
+ }
+-
+- public_deps = [ ":remap_alloc" ]
+ }
+ } else {
+ action("find_stdlib") {
+@@ -396,12 +361,6 @@ if (toolchain_has_rust) {
+ ":stdlib_public_dependent_libs",
+ ]
+ deps = [ ":prebuilt_rustc_copy_to_sysroot" ]
+-
+- # The host builds tools toolchain supports Rust only and does not use
+- # the allocator remapping to point it to PartitionAlloc.
+- if (!toolchain_for_rust_host_build_tools) {
+- deps += [ ":remap_alloc" ]
+- }
+ }
+ }
+ }
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 9a37800799e6..9b0ab86d6d91 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,4 +1,4 @@
---- 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.orig 2025-05-15 08:53:47 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -434,7 +434,7 @@
name: "AppTitle",
@@ -45,7 +45,7 @@
status: "stable",
public: true,
base_feature: "none",
-@@ -4645,7 +4645,7 @@
+@@ -4644,7 +4644,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
-@@ -4820,7 +4820,7 @@
+@@ -4819,7 +4819,7 @@
{
name: "WebAppScopeExtensions",
origin_trial_feature_name: "WebAppScopeExtensions",
@@ -63,7 +63,7 @@
status: "experimental",
base_feature: "none",
},
-@@ -5095,7 +5095,7 @@
+@@ -5094,7 +5094,7 @@
{
name: "WebIdentityDigitalCredentials",
origin_trial_feature_name: "WebIdentityDigitalCredentials",
diff --git a/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
new file mode 100644
index 000000000000..e106ca3408e3
--- /dev/null
+++ b/www/ungoogled-chromium/files/patch-ui_ozone_platform_wayland_host_wayland__frame__manager.cc
@@ -0,0 +1,13 @@
+--- ui/ozone/platform/wayland/host/wayland_frame_manager.cc.orig 2025-05-13 08:59:54 UTC
++++ ui/ozone/platform/wayland/host/wayland_frame_manager.cc
+@@ -461,8 +461,10 @@ std::optional<bool> WaylandFrameManager::ApplySurfaceC
+ surface->UpdateBufferDamageRegion(
+ gfx::ToEnclosingRectIgnoringError(surface_damage));
+
++#if !BUILDFLAG(IS_BSD)
+ if (!config.access_fence_handle.is_null())
+ surface->set_acquire_fence(std::move(config.access_fence_handle));
++#endif
+
+ bool needs_commit = false;
+
diff --git a/www/unit/Makefile b/www/unit/Makefile
index 4544f45f4acd..c331b0fb8614 100644
--- a/www/unit/Makefile
+++ b/www/unit/Makefile
@@ -1,5 +1,6 @@
PORTNAME= unit
PORTVERSION= ${UNIT_VERSION}
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES?= https://unit.nginx.org/download/
DISTFILES?= ${PORTNAME}-${PORTVERSION}.tar.gz
diff --git a/www/unit/files/patch-auto_njs b/www/unit/files/patch-auto_njs
new file mode 100644
index 000000000000..a4cbc6ec8d3c
--- /dev/null
+++ b/www/unit/files/patch-auto_njs
@@ -0,0 +1,22 @@
+--- auto/njs.orig 2025-02-27 22:02:21 UTC
++++ auto/njs
+@@ -25,8 +25,8 @@ nxt_feature_test="#include <njs.h>
+ nxt_feature_libs="$NXT_NJS_LIBS $NXT_NJS_AUX_LIBS"
+ nxt_feature_test="#include <njs.h>
+
+- #if NJS_VERSION_NUMBER < 0x000803
+- # error njs < 0.8.3 is not supported.
++ #if NJS_VERSION_NUMBER < 0x000900
++ # error njs < 0.9.0 is not supported.
+ #endif
+
+ int main(void) {
+@@ -44,7 +44,7 @@ if [ $nxt_found = no ]; then
+
+ if [ $nxt_found = no ]; then
+ $echo
+- $echo $0: error: no njs library \>= 0.8.3 found.
++ $echo $0: error: no njs library \>= 0.9.0 found.
+ $echo
+ exit 1;
+ fi
diff --git a/www/unit/files/patch-src_nxt__http__js.c b/www/unit/files/patch-src_nxt__http__js.c
new file mode 100644
index 000000000000..41a2a39a1c56
--- /dev/null
+++ b/www/unit/files/patch-src_nxt__http__js.c
@@ -0,0 +1,139 @@
+--- src/nxt_http_js.c.orig 2025-02-27 22:02:21 UTC
++++ src/nxt_http_js.c
+@@ -9,27 +9,31 @@ static njs_int_t nxt_http_js_ext_uri(njs_vm_t *vm, njs
+
+
+ static njs_int_t nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
+-static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
+- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
+ njs_value_t *retval);
++static njs_int_t nxt_http_js_ext_remote_addr(njs_vm_t *vm,
++ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
++ njs_value_t *setval, njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_get_args(njs_vm_t *vm,
+- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
+- njs_value_t *retval);
++ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
++ njs_value_t *setval, njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_get_header(njs_vm_t *vm,
+- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
+- njs_value_t *retval);
++ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
++ njs_value_t *setval, njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_keys_header(njs_vm_t *vm,
+ njs_value_t *value, njs_value_t *keys);
+ static njs_int_t nxt_http_js_ext_get_cookie(njs_vm_t *vm,
+- njs_object_prop_t *prop, njs_value_t *value, njs_value_t *setval,
++ njs_object_prop_t *prop, uint32_t atom_id, njs_value_t *value,
++ njs_value_t *setval,
+ njs_value_t *retval);
+ static njs_int_t nxt_http_js_ext_keys_cookie(njs_vm_t *vm, njs_value_t *value,
+ njs_value_t *keys);
+ static njs_int_t nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval);
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval);
+
+
+ static njs_external_t nxt_http_js_proto[] = {
+@@ -109,7 +113,7 @@ static njs_int_t
+
+
+ static njs_int_t
+-nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop,
++nxt_http_js_ext_uri(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
+ njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
+ {
+ nxt_http_request_t *r;
+@@ -126,7 +130,7 @@ static njs_int_t
+
+
+ static njs_int_t
+-nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop,
++nxt_http_js_ext_host(njs_vm_t *vm, njs_object_prop_t *prop, uint32_t atom_id,
+ njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
+ {
+ nxt_http_request_t *r;
+@@ -144,7 +148,8 @@ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_p
+
+ static njs_int_t
+ nxt_http_js_ext_remote_addr(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ nxt_http_request_t *r;
+
+@@ -162,7 +167,8 @@ nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop
+
+ static njs_int_t
+ nxt_http_js_ext_get_args(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ u_char *start;
+ njs_int_t ret;
+@@ -193,7 +199,8 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_pr
+
+ static njs_int_t
+ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ njs_int_t rc;
+ njs_str_t key;
+@@ -206,7 +213,7 @@ nxt_http_js_ext_get_header(njs_vm_t *vm, njs_object_pr
+ return NJS_DECLINED;
+ }
+
+- rc = njs_vm_prop_name(vm, prop, &key);
++ rc = njs_vm_prop_name(vm, atom_id, &key);
+ if (rc != NJS_OK) {
+ njs_value_undefined_set(retval);
+ return NJS_DECLINED;
+@@ -266,7 +273,8 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_pr
+
+ static njs_int_t
+ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ njs_int_t rc;
+ njs_str_t key;
+@@ -280,7 +288,7 @@ nxt_http_js_ext_get_cookie(njs_vm_t *vm, njs_object_pr
+ return NJS_DECLINED;
+ }
+
+- rc = njs_vm_prop_name(vm, prop, &key);
++ rc = njs_vm_prop_name(vm, atom_id, &key);
+ if (rc != NJS_OK) {
+ njs_value_undefined_set(retval);
+ return NJS_DECLINED;
+@@ -355,7 +363,8 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_
+
+ static njs_int_t
+ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_t *prop,
+- njs_value_t *value, njs_value_t *setval, njs_value_t *retval)
++ uint32_t atom_id, njs_value_t *value, njs_value_t *setval,
++ njs_value_t *retval)
+ {
+ njs_int_t rc;
+ njs_str_t key;
+@@ -369,7 +378,7 @@ nxt_http_js_ext_get_var(njs_vm_t *vm, njs_object_prop_
+ return NJS_DECLINED;
+ }
+
+- rc = njs_vm_prop_name(vm, prop, &key);
++ rc = njs_vm_prop_name(vm, atom_id, &key);
+ if (rc != NJS_OK) {
+ njs_value_undefined_set(retval);
+ return NJS_DECLINED;
diff --git a/www/xapian-omega/Makefile b/www/xapian-omega/Makefile
index 84f233c6da0e..328145fe01ee 100644
--- a/www/xapian-omega/Makefile
+++ b/www/xapian-omega/Makefile
@@ -1,5 +1,5 @@
PORTNAME= xapian-omega
-PORTVERSION= 1.4.28
+PORTVERSION= 1.4.29
CATEGORIES= www
MASTER_SITES= https://oligarchy.co.uk/xapian/${PORTVERSION}/ \
LOCAL/sunpoet
diff --git a/www/xapian-omega/distinfo b/www/xapian-omega/distinfo
index e50a251f2aff..3e29ae4d217e 100644
--- a/www/xapian-omega/distinfo
+++ b/www/xapian-omega/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745177936
-SHA256 (xapian-omega-1.4.28.tar.xz) = 870d2f2d7f9f0bc67337aa505fdc13f67f84cce4d93b7e5c82c7310226f0d30a
-SIZE (xapian-omega-1.4.28.tar.xz) = 589064
+TIMESTAMP = 1745936068
+SHA256 (xapian-omega-1.4.29.tar.xz) = 4fba4e9d496b4e4dba0a409ce2342e5958a69c6ab3e60ee4dda25be5c20cf83e
+SIZE (xapian-omega-1.4.29.tar.xz) = 589016
diff --git a/www/yarn-node24/Makefile b/www/yarn-node24/Makefile
new file mode 100644
index 000000000000..f65ee187eaed
--- /dev/null
+++ b/www/yarn-node24/Makefile
@@ -0,0 +1,5 @@
+USES= nodejs:24,run
+
+MASTERDIR= ${.CURDIR}/../yarn-node22
+
+.include "${MASTERDIR}/Makefile"
diff --git a/www/yourls/Makefile b/www/yourls/Makefile
index b4ede641ed4c..681073633c89 100644
--- a/www/yourls/Makefile
+++ b/www/yourls/Makefile
@@ -1,5 +1,5 @@
PORTNAME= yourls
-PORTVERSION= 1.10.0
+PORTVERSION= 1.10.1
CATEGORIES= www
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/www/yourls/distinfo b/www/yourls/distinfo
index aa99f8249663..517a8bd9c637 100644
--- a/www/yourls/distinfo
+++ b/www/yourls/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1744288764
-SHA256 (YOURLS-YOURLS-1.10.0_GH0.tar.gz) = 2756e534ef8a92fc183af5000583b354c9f147beca4a35f68dbe1b0ed0e40bc5
-SIZE (YOURLS-YOURLS-1.10.0_GH0.tar.gz) = 5815362
+TIMESTAMP = 1745936050
+SHA256 (YOURLS-YOURLS-1.10.1_GH0.tar.gz) = ec21841af21194c8ef06a8eaaea5bf26d329741f9d09e04b32685a2d8ac4027e
+SIZE (YOURLS-YOURLS-1.10.1_GH0.tar.gz) = 5884813
diff --git a/www/youtube/Makefile b/www/youtube/Makefile
index 57e87d199553..a4e6fca5dedc 100644
--- a/www/youtube/Makefile
+++ b/www/youtube/Makefile
@@ -1,7 +1,6 @@
PORTNAME= youtube
DISTVERSIONPREFIX= v
-DISTVERSION= 2.10.3
-PORTREVISION= 1
+DISTVERSION= 2.10.4
CATEGORIES= www
PKGNAMESUFFIX= -downloader
diff --git a/www/youtube/distinfo b/www/youtube/distinfo
index be542e5b2d76..8974540bcee5 100644
--- a/www/youtube/distinfo
+++ b/www/youtube/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1742724056
-SHA256 (go/www_youtube/youtube-v2.10.3/v2.10.3.mod) = a7c9caede906479bb1ace136cde4c6bc6cd97170070a456af65eb8668c2f3264
-SIZE (go/www_youtube/youtube-v2.10.3/v2.10.3.mod) = 1941
-SHA256 (go/www_youtube/youtube-v2.10.3/v2.10.3.zip) = f721817dcb68537dfd2565e4035a6ce76de0d95859f28f6f11cf82ec95b6cfa1
-SIZE (go/www_youtube/youtube-v2.10.3/v2.10.3.zip) = 60911
+TIMESTAMP = 1746744251
+SHA256 (go/www_youtube/youtube-v2.10.4/v2.10.4.mod) = a7c9caede906479bb1ace136cde4c6bc6cd97170070a456af65eb8668c2f3264
+SIZE (go/www_youtube/youtube-v2.10.4/v2.10.4.mod) = 1941
+SHA256 (go/www_youtube/youtube-v2.10.4/v2.10.4.zip) = 4fd31a998bd54172f024e455f9fe69f24421dcca1fe161070a467cdc37bc82a1
+SIZE (go/www_youtube/youtube-v2.10.4/v2.10.4.zip) = 61289
diff --git a/www/yt-dlp/Makefile b/www/yt-dlp/Makefile
index bbab7c3b6946..a50ff968da92 100644
--- a/www/yt-dlp/Makefile
+++ b/www/yt-dlp/Makefile
@@ -1,5 +1,5 @@
PORTNAME= yt-dlp
-DISTVERSION= 2025.03.31
+DISTVERSION= 2025.04.30
CATEGORIES= www
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
DISTNAME= ${PORTNAME}
diff --git a/www/yt-dlp/distinfo b/www/yt-dlp/distinfo
index 137b83984fb6..cf80b9c76c73 100644
--- a/www/yt-dlp/distinfo
+++ b/www/yt-dlp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743466071
-SHA256 (yt-dlp/2025.03.31/yt-dlp.tar.gz) = 23ab23b7dffada34f98ecbffc3da763834ee3b0d969d5d10f8436ca6c32ca9eb
-SIZE (yt-dlp/2025.03.31/yt-dlp.tar.gz) = 5918295
+TIMESTAMP = 1746804374
+SHA256 (yt-dlp/2025.04.30/yt-dlp.tar.gz) = feb3113fc38c1c0f987d2cfcb7366fed65fa508ff302e7bd8ac9be87c7774b31
+SIZE (yt-dlp/2025.04.30/yt-dlp.tar.gz) = 5947502
diff --git a/www/zenphoto/Makefile b/www/zenphoto/Makefile
index fe8b8c203eda..bd9577a01f69 100644
--- a/www/zenphoto/Makefile
+++ b/www/zenphoto/Makefile
@@ -1,5 +1,5 @@
PORTNAME= zenphoto
-PORTVERSION= 1.6.5
+PORTVERSION= 1.6.6
DISTVERSIONPREFIX= v
CATEGORIES= www
PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX}
diff --git a/www/zenphoto/distinfo b/www/zenphoto/distinfo
index e11b32447bab..ff776d13bde2 100644
--- a/www/zenphoto/distinfo
+++ b/www/zenphoto/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1729926975
-SHA256 (zenphoto-zenphoto-v1.6.5_GH0.tar.gz) = 6cb213584457e62f03c688c5b4fbc7aaf1d76ed100dfd898e0df2e7eccecb9fa
-SIZE (zenphoto-zenphoto-v1.6.5_GH0.tar.gz) = 15027149
+TIMESTAMP = 1747546450
+SHA256 (zenphoto-zenphoto-v1.6.6_GH0.tar.gz) = eba0dc482bd73af84af4891c3b730755a014f5869d0968081bc6a30f4b98ee46
+SIZE (zenphoto-zenphoto-v1.6.6_GH0.tar.gz) = 14457277
diff --git a/www/zenphoto/pkg-plist b/www/zenphoto/pkg-plist
index fd8edaffd7b2..199428afb6de 100644
--- a/www/zenphoto/pkg-plist
+++ b/www/zenphoto/pkg-plist
@@ -34,10 +34,6 @@
%%WWWDIR%%/themes/basic/theme.png
%%WWWDIR%%/themes/basic/theme_description.php
%%WWWDIR%%/themes/basic/themeoptions.php
-%%WWWDIR%%/themes/basic/tinymce4/config/dark_comment-full.js.php
-%%WWWDIR%%/themes/basic/tinymce4/config/dark_comment-ribbon.js.php
-%%WWWDIR%%/themes/basic/tinymce4/config/dark_comment-slim.js.php
-%%WWWDIR%%/themes/basic/tinymce4/config/dark_content.css
%%WWWDIR%%/themes/garland/404.php
%%WWWDIR%%/themes/garland/album.php
%%WWWDIR%%/themes/garland/archive.php
@@ -354,6 +350,7 @@
%%WWWDIR%%/zp-core/auth.php
%%WWWDIR%%/zp-core/classes/class-_zp_captcha.php
%%WWWDIR%%/zp-core/classes/class-_zp_html_cache.php
+%%WWWDIR%%/zp-core/classes/class-admingallerystats.php
%%WWWDIR%%/zp-core/classes/class-administrator.php
%%WWWDIR%%/zp-core/classes/class-album.php
%%WWWDIR%%/zp-core/classes/class-albumbase.php
@@ -379,7 +376,10 @@
%%WWWDIR%%/zp-core/classes/class-searchengine.php
%%WWWDIR%%/zp-core/classes/class-themeobject.php
%%WWWDIR%%/zp-core/classes/class-transientimage.php
+%%WWWDIR%%/zp-core/classes/class-update.php
%%WWWDIR%%/zp-core/classes/class-userdataexport.php
+%%WWWDIR%%/zp-core/classes/class-zenphoto_administrator.php
+%%WWWDIR%%/zp-core/classes/class-zenphoto_authority.php
%%WWWDIR%%/zp-core/classes/class-zpmutex.php
%%WWWDIR%%/zp-core/controller.php
%%WWWDIR%%/zp-core/cron_runner.php
@@ -389,6 +389,7 @@
%%WWWDIR%%/zp-core/css/admintoolbox.css
%%WWWDIR%%/zp-core/deprecated/functions-db.php
%%WWWDIR%%/zp-core/deprecated/functions-graphics.php
+%%WWWDIR%%/zp-core/deprecated/rsslib.php
%%WWWDIR%%/zp-core/file-templates/cacheprotect
%%WWWDIR%%/zp-core/file-templates/closed.css
%%WWWDIR%%/zp-core/file-templates/dataaccess
@@ -651,6 +652,7 @@
%%WWWDIR%%/zp-core/js/zp_admin.js
%%WWWDIR%%/zp-core/js/zp_general.js
%%WWWDIR%%/zp-core/js/zp_upload.js
+%%WWWDIR%%/zp-core/libs/class-rsslib.php
%%WWWDIR%%/zp-core/libs/class-utf8.php
%%WWWDIR%%/zp-core/libs/class-zipstream.php
%%WWWDIR%%/zp-core/libs/functions-encryption.php
@@ -799,7 +801,6 @@
%%WWWDIR%%/zp-core/zp-extensions/cacheManager/cacheDBImages.php
%%WWWDIR%%/zp-core/zp-extensions/cacheManager/cacheImages.php
%%WWWDIR%%/zp-core/zp-extensions/cacheManager/deprecated-functions.php
-%%WWWDIR%%/zp-core/zp-extensions/check_for_update.php
%%WWWDIR%%/zp-core/zp-extensions/class-AnyFile.php
%%WWWDIR%%/zp-core/zp-extensions/class-AnyFile/anyFileDefault.png
%%WWWDIR%%/zp-core/zp-extensions/class-WEBdocs.php
@@ -931,10 +932,10 @@
%%WWWDIR%%/zp-core/zp-extensions/deprecated-functions/deprecated-functions.php
%%WWWDIR%%/zp-core/zp-extensions/deprecated-functions/functions.php
%%WWWDIR%%/zp-core/zp-extensions/downloadList.php
-%%WWWDIR%%/zp-core/zp-extensions/downloadList/download_statistics.php
%%WWWDIR%%/zp-core/zp-extensions/dynamic-locale.php
%%WWWDIR%%/zp-core/zp-extensions/dynamic-locale/locale.css
%%WWWDIR%%/zp-core/zp-extensions/elFinder.php
+%%WWWDIR%%/zp-core/zp-extensions/elFinder/LICENSE.md
%%WWWDIR%%/zp-core/zp-extensions/elFinder/css/elfinder.full.css
%%WWWDIR%%/zp-core/zp-extensions/elFinder/css/elfinder.min.css
%%WWWDIR%%/zp-core/zp-extensions/elFinder/css/theme.css
@@ -1093,6 +1094,7 @@
%%WWWDIR%%/zp-core/zp-extensions/elFinder/php/plugins/WinRemoveTailDots/plugin.php
%%WWWDIR%%/zp-core/zp-extensions/elFinder/php/resources/image.png
%%WWWDIR%%/zp-core/zp-extensions/elFinder/php/resources/video.png
+%%WWWDIR%%/zp-core/zp-extensions/elFinder/sounds/rm.wav
%%WWWDIR%%/zp-core/zp-extensions/email-newuser.php
%%WWWDIR%%/zp-core/zp-extensions/exampleMacros.php
%%WWWDIR%%/zp-core/zp-extensions/favoritesHandler.php
@@ -1152,7 +1154,6 @@
%%WWWDIR%%/zp-core/zp-extensions/lazyload/ls.unveilhooks.min.js
%%WWWDIR%%/zp-core/zp-extensions/macroList.php
%%WWWDIR%%/zp-core/zp-extensions/macroList/macroList_tab.php
-%%WWWDIR%%/zp-core/zp-extensions/markRelease.php
%%WWWDIR%%/zp-core/zp-extensions/matomo.php
%%WWWDIR%%/zp-core/zp-extensions/matomo/matomo_tab.php
%%WWWDIR%%/zp-core/zp-extensions/menu_manager.php
@@ -1161,42 +1162,39 @@
%%WWWDIR%%/zp-core/zp-extensions/menu_manager/menu_tab_edit.php
%%WWWDIR%%/zp-core/zp-extensions/mergedRSS.php
%%WWWDIR%%/zp-core/zp-extensions/mobileTheme.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/CHANGELOG.md
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/CNAME
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/CONTRIBUTING.md
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/KNOWN_LIMITATIONS.md
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/LICENSE
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/MobileDetect.json
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/README.md
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/SECURITY.md
%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/composer.json
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/composer.lock
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/autoload.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/ClassLoader.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/InstalledVersions.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/LICENSE
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/autoload_classmap.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/autoload_namespaces.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/autoload_psr4.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/autoload_real.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/autoload_static.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/installed.json
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/installed.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/composer/platform_check.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/CHANGELOG.md
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/CNAME
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/CONTRIBUTING.md
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/KNOWN_LIMITATIONS.md
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/LICENSE
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/MobileDetect.json
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/README.md
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/SECURITY.md
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/composer.json
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/docker-compose.yml
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/phpbench.json
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/src/Cache/Cache.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/src/Cache/CacheException.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/src/Cache/CacheItem.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/src/Exception/MobileDetectException.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/mobiledetect/mobiledetectlib/src/MobileDetect.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/psr/simple-cache/LICENSE.md
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/psr/simple-cache/README.md
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/psr/simple-cache/composer.json
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/psr/simple-cache/src/CacheException.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/psr/simple-cache/src/CacheInterface.php
-%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/vendor/psr/simple-cache/src/InvalidArgumentException.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/docker-compose.yml
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/docker/Dockerfile.setup
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/phpbench.json
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/src/Cache/Cache.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/src/Cache/CacheException.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/src/Cache/CacheItem.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/src/Exception/MobileDetectException.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/src/MobileDetect.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/src/MobileDetectStandalone.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/autoloader.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/cache/CHANGELOG.md
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/cache/LICENSE.txt
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/cache/README.md
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/cache/composer.json
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/cache/src/CacheException.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/cache/src/CacheItemInterface.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/cache/src/CacheItemPoolInterface.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/cache/src/InvalidArgumentException.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/simple-cache/LICENSE.md
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/simple-cache/README.md
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/simple-cache/composer.json
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/simple-cache/src/CacheException.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/simple-cache/src/CacheInterface.php
+%%WWWDIR%%/zp-core/zp-extensions/mobileTheme/standalone/deps/simple-cache/src/InvalidArgumentException.php
%%WWWDIR%%/zp-core/zp-extensions/multiple_layouts.php
%%WWWDIR%%/zp-core/zp-extensions/openstreetmap.php
%%WWWDIR%%/zp-core/zp-extensions/openstreetmap/Control.MiniMap.min.css
@@ -1248,10 +1246,11 @@
%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/fonts/scriptless-socialbuttons.svg
%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/fonts/scriptless-socialbuttons.ttf
%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/fonts/scriptless-socialbuttons.woff
+%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/fonts/scriptless-socialbuttons.woff2
%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/selection.json
%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/style.css
-%%WWWDIR%%/zp-core/zp-extensions/scriptless-socialsharing/style.min.css
%%WWWDIR%%/zp-core/zp-extensions/search_statistics.php
+%%WWWDIR%%/zp-core/zp-extensions/search_statistics/class-admingallerystatssearch.php
%%WWWDIR%%/zp-core/zp-extensions/search_statistics/search_analysis.php
%%WWWDIR%%/zp-core/zp-extensions/security-logger.php
%%WWWDIR%%/zp-core/zp-extensions/seo_cleanup.php
@@ -1290,6 +1289,7 @@
%%WWWDIR%%/zp-core/zp-extensions/tag_extras.php
%%WWWDIR%%/zp-core/zp-extensions/tag_suggest.php
%%WWWDIR%%/zp-core/zp-extensions/tag_suggest/tag.css
+%%WWWDIR%%/zp-core/zp-extensions/tag_suggest/tag_admin.css
%%WWWDIR%%/zp-core/zp-extensions/themeSwitcher.php
%%WWWDIR%%/zp-core/zp-extensions/tinyURL.php
%%WWWDIR%%/zp-core/zp-extensions/tinymce.php
@@ -1506,177 +1506,6 @@
%%WWWDIR%%/zp-core/zp-extensions/tinymce/themes/silver/theme.min.js
%%WWWDIR%%/zp-core/zp-extensions/tinymce/tinymce.d.ts
%%WWWDIR%%/zp-core/zp-extensions/tinymce/tinymce.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/comment-full.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/comment-ribbon.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/comment-slim.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/content.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenpage-basic.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenpage-classic.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenpage-full.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenpage-light.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenpage-ribbon.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenpage-slim.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenphoto-basic.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenphoto-classic.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenphoto-full.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenphoto-light.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenphoto-ribbon.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/config/zenphoto-slim.js.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/da.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/de.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/es.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/fr_FR.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/gl.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/he_IL.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/it.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/ja.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/nl.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/pl.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/ru.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/sk.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/sv_SE.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/zh_CN.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/langs/zh_TW.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/license.txt
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/advlist/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/anchor/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/autolink/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/autoresize/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/autosave/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/bbcode/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/charmap/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/code/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/codesample/css/prism.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/codesample/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/colorpicker/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/css/dialog.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/editable_selects.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/form_utils.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/img/buttons.png
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/img/icons.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/img/items.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/img/menu_arrow.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/img/menu_check.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/img/progress.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/img/tabs.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/mctabs.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/plugin.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/tiny_mce_popup.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/utils/editable_selects.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/utils/form_utils.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/utils/mctabs.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/utils/validate.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/compat3x/validate.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/contextmenu/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/directionality/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-cool.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-cry.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-embarassed.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-foot-in-mouth.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-frown.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-innocent.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-kiss.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-laughing.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-money-mouth.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-sealed.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-smile.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-surprised.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-tongue-out.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-undecided.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-wink.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/img/smiley-yell.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/emoticons/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/fullpage/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/fullscreen/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/help/img/logo.png
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/help/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/hr/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/image/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/imagetools/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/importcss/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/insertdatetime/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/legacyoutput/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/link/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/lists/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/media/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/nonbreaking/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/noneditable/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/pagebreak/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/paste/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/preview/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/print/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/save/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/searchreplace/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/spellchecker/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tabfocus/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/table/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/template/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/textcolor/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/textpattern/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/License.txt
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/css/thickbox.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/css/tinyzenpage.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/img/loadingAnimation.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/img/magnify.png
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/img/tinyzenpage.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/img/wrapLeft.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/img/wrapNone.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/img/wrapRight.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/js/dialog.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/tinyzenpage-functions.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/tinyzenpage.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/tinyzenpage/zoom.php
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/toc/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/visualblocks/css/visualblocks.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/visualblocks/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/visualchars/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/plugins/wordcount/plugin.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/content.inline.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/content.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/content.mobile.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-mobile.woff
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.eot
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.svg
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.ttf
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce-small.woff
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce.eot
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce.svg
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce.ttf
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/fonts/tinymce.woff
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/img/anchor.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/img/loader.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/img/object.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/img/trans.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/skin.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/skin.min.css.map
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/skin.mobile.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/lightgray/skin.mobile.min.css.map
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/content.inline.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/content.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon-small.eot
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon-small.svg
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon-small.ttf
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon-small.woff
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon.eot
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon.svg
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon.ttf
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/icomoon.woff
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/fonts/readme.md
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/img/anchor.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/img/loader.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/img/object.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/img/trans.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/img/wline.gif
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/skin.ie7.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/skin.json
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/skins/tundora/skin.min.css
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/themes/inlite/theme.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/themes/mobile/theme.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/themes/modern/theme.min.js
-%%WWWDIR%%/zp-core/zp-extensions/tinymce4/tinymce.min.js
%%WWWDIR%%/zp-core/zp-extensions/trivialSpam.php
%%WWWDIR%%/zp-core/zp-extensions/uploader_http.php
%%WWWDIR%%/zp-core/zp-extensions/uploader_http/httpupload.css
@@ -1811,7 +1640,6 @@
%%WWWDIR%%/zp-core/zp-extensions/zenpage/zenpage.css
%%WWWDIR%%/zp-core/zp-extensions/zenphotoDonate.php
%%WWWDIR%%/zp-core/zp-extensions/zenphoto_news.php
-%%WWWDIR%%/zp-core/zp-extensions/zenphoto_news/rsslib.php
%%WWWDIR%%/zp-core/zp-extensions/zenphoto_sendmail.php
@dir %%WWWDIR%%/albums
@dir %%WWWDIR%%/cache